From 9decc528d8b3c19979751949301f79140a9e4ae7 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 1 Mar 2015 10:56:24 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_SUPPORT_USB_INT This one is always defined. Signed-off-by: Larry Finger --- hal/usb_halinit.c | 10 +--------- hal/usb_ops_linux.c | 11 +---------- include/autoconf.h | 2 -- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 850358e..aa475d7 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -328,7 +328,6 @@ _InitInterrupt( rtw_write32(Adapter, REG_HIMRE_88E, imr_ex); pHalData->IntrMask[1]=imr_ex; -#ifdef CONFIG_SUPPORT_USB_INT /* REG_USB_SPECIAL_OPTION - BIT(4) */ /* 0; Use interrupt endpoint to upload interrupt pkt */ /* 1; Use bulk endpoint to upload interrupt pkt, */ @@ -345,12 +344,8 @@ _InitInterrupt( usb_opt = usb_opt | (INT_BULK_SEL); rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, usb_opt ); - -#endif/* CONFIG_SUPPORT_USB_INT */ - } - static void _InitQueueReservedPage( IN struct adapter *Adapter @@ -1757,14 +1752,11 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); DBG_8192C("==> %s \n",__FUNCTION__); -#ifdef CONFIG_SUPPORT_USB_INT rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E); -#endif DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive); - if(pwrctl->bkeepfwalive) - { + if(pwrctl->bkeepfwalive) { if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown)) rtl8188eu_hw_power_down(Adapter); } else { diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index c4e3b73..64bad22 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -300,7 +300,6 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata return usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype); } -#ifdef CONFIG_SUPPORT_USB_INT static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf) { HAL_DATA_TYPE *pHalData=GET_HAL_DATA(padapter); @@ -333,7 +332,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb } } -#endif #ifdef CONFIG_USB_INTERRUPT_IN_PIPE static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) @@ -609,17 +607,10 @@ static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb) pattrib->MacIDValidEntry[0], pattrib->MacIDValidEntry[1] ); - - } - else if (pattrib->pkt_rpt_type == HIS_REPORT) - { - /* DBG_8192C("%s , rx USB HISR \n",__FUNCTION__); */ - #ifdef CONFIG_SUPPORT_USB_INT + } else if (pattrib->pkt_rpt_type == HIS_REPORT) { interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); - #endif } rtw_free_recvframe(precvframe, pfree_recv_queue); - } pkt_cnt--; diff --git a/include/autoconf.h b/include/autoconf.h index beec89b..02cf819 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -30,8 +30,6 @@ #define CONFIG_EMBEDDED_FWIMG - #define CONFIG_SUPPORT_USB_INT - #define CONFIG_AP_MODE #ifdef CONFIG_AP_MODE #define CONFIG_FIND_BEST_CHANNEL