skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-13 00:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC

Browse source 
This symbol is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-27 20:21:19 -06:00
parent 51e00090df
commit 32c09fed58
4 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hal/usb_ops_linux.c
View file

@ -62,21 +62,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
_enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
/* Acquire IO memory for vendorreq */ /* Acquire IO memory for vendorreq */
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
pIo_buf = pdvobjpriv->usb_vendor_req_buf; pIo_buf = pdvobjpriv->usb_vendor_req_buf;
#else
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
tmp_buf = rtw_malloc( (u32) len + ALIGNMENT_UNIT);
tmp_buflen = (u32)len + ALIGNMENT_UNIT;
#else /* use stack memory */
tmp_buflen = MAX_USB_IO_CTL_SIZE;
#endif
/* Added by Albert 2010/02/09 */
/* For mstar platform, mstar suggests the address for USB IO should be 16 bytes alignment. */
/* Trying to fix it here. */
pIo_buf = (tmp_buf==NULL)?NULL:tmp_buf + ALIGNMENT_UNIT -((SIZE_PTR)(tmp_buf) & 0x0f );
#endif
if ( pIo_buf== NULL) { if ( pIo_buf== NULL) {
DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ ); DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ );

6
include/autoconf.h
View file

@ -76,12 +76,6 @@
#define CONFIG_BR_EXT_BRNAME "br0" #define CONFIG_BR_EXT_BRNAME "br0"
#endif // CONFIG_BR_EXT #endif // CONFIG_BR_EXT
/*
* USB VENDOR REQ BUFFER ALLOCATION METHOD
* if not set we'll use function local variable (stack memory)
*/
#define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
/* /*
* HAL Related Config * HAL Related Config
*/ */

6
include/drv_types.h
View file

@ -274,10 +274,8 @@ struct dvobj_priv
_mutex usb_vendor_req_mutex; _mutex usb_vendor_req_mutex;
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC u8 *usb_alloc_vendor_req_buf;
u8 * usb_alloc_vendor_req_buf; u8 *usb_vendor_req_buf;
u8 * usb_vendor_req_buf;
#endif
struct usb_interface *pusbintf; struct usb_interface *pusbintf;
struct usb_device *pusbdev; struct usb_device *pusbdev;

6
os_dep/usb_intf.c
View file

@ -228,7 +228,6 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
_rtw_mutex_init(&dvobj->usb_vendor_req_mutex); _rtw_mutex_init(&dvobj->usb_vendor_req_mutex);
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
if (dvobj->usb_alloc_vendor_req_buf == NULL) { if (dvobj->usb_alloc_vendor_req_buf == NULL) {
DBG_871X("alloc usb_vendor_req_buf failed... /n"); DBG_871X("alloc usb_vendor_req_buf failed... /n");
@ -238,20 +237,15 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
dvobj->usb_vendor_req_buf = dvobj->usb_vendor_req_buf =
(u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(dvobj->usb_alloc_vendor_req_buf ), ALIGNMENT_UNIT); (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(dvobj->usb_alloc_vendor_req_buf ), ALIGNMENT_UNIT);
exit: exit:
#endif
return rst; return rst;
} }
static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj) static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
{ {
u8 rst = _SUCCESS; u8 rst = _SUCCESS;
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
if(dvobj->usb_vendor_req_buf) if(dvobj->usb_vendor_req_buf)
rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE);
#endif
_rtw_mutex_free(&dvobj->usb_vendor_req_mutex); _rtw_mutex_free(&dvobj->usb_vendor_req_mutex);