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

rtl8188eu: Remove CONFIG_IOL

Browse source 
This parameter is defined by default.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-01 10:36:23 -06:00
parent f7d31c956e
commit 1155811fcf
13 changed files with 1 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/rtw_iol.c
View file

@ -20,7 +20,6 @@
#include<rtw_iol.h> #include<rtw_iol.h>
#ifdef CONFIG_IOL
struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter) struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)
{ {
struct xmit_frame *xmit_frame; struct xmit_frame *xmit_frame;
@ -259,5 +258,3 @@ void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf)
printk("\n"); printk("\n");
printk("============= ioreg_cmd len = %d =============== \n",buf_len); printk("============= ioreg_cmd len = %d =============== \n",buf_len);
} }
#endif /* CONFIG_IOL */

2
hal/hal_intf.c
View file

@ -500,14 +500,12 @@ bool rtw_hal_sreset_inprogress(struct adapter *padapter)
} }
#endif /* DBG_CONFIG_ERROR_DETECT */ #endif /* DBG_CONFIG_ERROR_DETECT */
#ifdef CONFIG_IOL
int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{ {
if(adapter->HalFunc.IOL_exec_cmds_sync) if(adapter->HalFunc.IOL_exec_cmds_sync)
return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt); return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt);
return _FAIL; return _FAIL;
} }
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(struct adapter *padapter) s32 rtw_hal_xmit_thread_handler(struct adapter *padapter)

9
hal/rtl8188e_hal_init.c
View file

@ -26,7 +26,6 @@
#include <rtw_iol.h> #include <rtw_iol.h>
#if defined(CONFIG_IOL)
#include <usb_ops.h> #include <usb_ops.h>
static void iol_mode_enable(struct adapter *padapter, u8 enable) static void iol_mode_enable(struct adapter *padapter, u8 enable)
@ -515,9 +514,6 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len)
printk("###### %s ######\n",__FUNCTION__); printk("###### %s ######\n",__FUNCTION__);
} }
#endif /* defined(CONFIG_IOL) */
static void static void
_FWDownloadEnable( _FWDownloadEnable(
IN struct adapter * padapter, IN struct adapter * padapter,
@ -1427,7 +1423,6 @@ ReadEFuseByIC(
u8 logical_map[512]; u8 logical_map[512];
#endif #endif
#ifdef CONFIG_IOL
if(!bPseudoTest )/* rtw_IOL_applied(Adapter)) */ if(!bPseudoTest )/* rtw_IOL_applied(Adapter)) */
{ {
int ret = _FAIL; int ret = _FAIL;
@ -1447,7 +1442,6 @@ ReadEFuseByIC(
goto exit; goto exit;
} }
} }
#endif
Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest);
exit: exit:
@ -2797,12 +2791,9 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->xmit_thread_handler = &hal_xmit_handler; pHalFunc->xmit_thread_handler = &hal_xmit_handler;
#endif #endif
#ifdef CONFIG_IOL
pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync; pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;
#endif
pHalFunc->hal_notch_filter = &hal_notch_filter_8188e; pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;
} }
u8 GetEEPROMSize8188E(struct adapter *padapter) u8 GetEEPROMSize8188E(struct adapter *padapter)

5
hal/rtl8188e_phycfg.c
View file

@ -22,14 +22,9 @@
#include <drv_conf.h> #include <drv_conf.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifdef CONFIG_IOL
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
/*---------------------------Define Local Constant---------------------------*/ /*---------------------------Define Local Constant---------------------------*/
/* Channel switch:The size of command tables for switch channel*/ /* Channel switch:The size of command tables for switch channel*/
#define MAX_PRECMD_CNT 16 #define MAX_PRECMD_CNT 16

6
hal/usb_halinit.c
View file

@ -26,11 +26,7 @@
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#include <rtl8188e_led.h> #include <rtl8188e_led.h>
#ifdef CONFIG_IOL
#include <rtw_iol.h> #include <rtw_iol.h>
#endif
#include <usb_ops.h> #include <usb_ops.h>
#include <usb_hal.h> #include <usb_hal.h>
#include <usb_osintf.h> #include <usb_osintf.h>
@ -1461,13 +1457,11 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
#endif #endif
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
#if defined(CONFIG_IOL)
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if(status == _FAIL){ if(status == _FAIL){
DBG_871X("%s rtl8188e_iol_efuse_patch failed \n",__FUNCTION__); DBG_871X("%s rtl8188e_iol_efuse_patch failed \n",__FUNCTION__);
goto exit; goto exit;
} }
#endif
_InitTxBufferBoundary(Adapter, txpktbuf_bndy); _InitTxBufferBoundary(Adapter, txpktbuf_bndy);

2
include/autoconf.h
View file

@ -32,8 +32,6 @@
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#define CONFIG_IOL
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
#define CONFIG_FIND_BEST_CHANNEL #define CONFIG_FIND_BEST_CHANNEL

2
include/drv_types.h
View file

@ -174,9 +174,7 @@ struct registry_priv
u8 max_roaming_times; // the max number driver will try to roaming u8 max_roaming_times; // the max number driver will try to roaming
#ifdef CONFIG_IOL
u8 fw_iol; //enable iol without other concern u8 fw_iol; //enable iol without other concern
#endif
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
u8 enable80211d; u8 enable80211d;

4
include/hal_intf.h
View file

@ -250,9 +250,7 @@ struct hal_ops {
bool (*sreset_inprogress)(struct adapter *padapter); bool (*sreset_inprogress)(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL
int (*IOL_exec_cmds_sync)(struct adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int (*IOL_exec_cmds_sync)(struct adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 (*xmit_thread_handler)(struct adapter *padapter); s32 (*xmit_thread_handler)(struct adapter *padapter);
@ -459,9 +457,7 @@ u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
bool rtw_hal_sreset_inprogress(struct adapter *padapter); bool rtw_hal_sreset_inprogress(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL
int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(struct adapter *padapter); s32 rtw_hal_xmit_thread_handler(struct adapter *padapter);

3
include/rtl8188e_hal.h
View file

@ -546,10 +546,7 @@ void SetBcnCtrlReg(struct adapter *padapter, u8 SetBits, u8 ClearBits);
void rtl8188e_start_thread(struct adapter *padapter); void rtl8188e_start_thread(struct adapter *padapter);
void rtl8188e_stop_thread(struct adapter *padapter); void rtl8188e_stop_thread(struct adapter *padapter);
void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len); void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len);
#ifdef CONFIG_IOL
s32 rtl8188e_iol_efuse_patch(struct adapter *padapter); s32 rtl8188e_iol_efuse_patch(struct adapter *padapter);
#endif//CONFIG_IOL
#endif //__RTL8188E_HAL_H__ #endif //__RTL8188E_HAL_H__

2
include/rtl8192c_cmd.h
View file

@ -96,12 +96,10 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter*padapter,u8 bfwpoll, u16 peri
void rtl8192c_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state); void rtl8192c_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state);
#endif //CONFIG_P2P #endif //CONFIG_P2P
#ifdef CONFIG_IOL
typedef struct _IO_OFFLOAD_LOC{ typedef struct _IO_OFFLOAD_LOC{
u8 LocCmd; u8 LocCmd;
}IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC; }IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC;
int rtl8192c_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtl8192c_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif //CONFIG_IOL
#ifdef CONFIG_BEACON_DISABLE_OFFLOAD #ifdef CONFIG_BEACON_DISABLE_OFFLOAD
u8 rtl8192c_dis_beacon_fun_cmd(struct adapter* padapter); u8 rtl8192c_dis_beacon_fun_cmd(struct adapter* padapter);

15
os_dep/ioctl_linux.c
View file

@ -31,13 +31,11 @@
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>
#include <rtw_ioctl_query.h> #include <rtw_ioctl_query.h>
#include <mlme_osdep.h> #include <mlme_osdep.h>
#include <rtw_mp_ioctl.h> #include <rtw_mp_ioctl.h>
#include <usb_ops.h> #include <usb_ops.h>
#include <rtw_version.h> #include <rtw_version.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#include <rtw_iol.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) #define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e)
@ -5816,9 +5814,6 @@ static void rf_reg_dump(struct adapter *padapter)
} }
} }
#ifdef CONFIG_IOL
#include <rtw_iol.h>
#endif
static int rtw_dbg_port(struct net_device *dev, static int rtw_dbg_port(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
@ -5912,7 +5907,6 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x78: /* IOL test */ case 0x78: /* IOL test */
switch(minor_cmd) switch(minor_cmd)
{ {
#ifdef CONFIG_IOL
case 0x04: /* LLT table initialization test */ case 0x04: /* LLT table initialization test */
{ {
u8 page_boundary = 0xf9; u8 page_boundary = 0xf9;
@ -6053,7 +6047,6 @@ static int rtw_dbg_port(struct net_device *dev,
} }
} }
break; break;
#endif /* CONFIG_IOL */
} }
break; break;
case 0x79: case 0x79:
@ -8113,9 +8106,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
u16 i=0, j=0, mapLen=0, addr=0, cnts=0; u16 i=0, j=0, mapLen=0, addr=0, cnts=0;
u16 max_available_size=0, raw_cursize=0, raw_maxsize=0; u16 max_available_size=0, raw_cursize=0, raw_maxsize=0;
int err; int err;
#ifdef CONFIG_IOL
u8 org_fw_iol = padapter->registrypriv.fw_iol;/* 0:Disable, 1:enable, 2:by usb speed */ u8 org_fw_iol = padapter->registrypriv.fw_iol;/* 0:Disable, 1:enable, 2:by usb speed */
#endif
wrqu = (struct iw_point*)wdata; wrqu = (struct iw_point*)wdata;
pwrctrlpriv = adapter_to_pwrctl(padapter); pwrctrlpriv = adapter_to_pwrctl(padapter);
@ -8157,9 +8148,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
tmp[i] = token; tmp[i] = token;
i++; i++;
} }
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = 0;/* 0:Disable, 1:enable, 2:by usb speed */ padapter->registrypriv.fw_iol = 0;/* 0:Disable, 1:enable, 2:by usb speed */
#endif
if(strcmp(tmp[0], "status") == 0){ if(strcmp(tmp[0], "status") == 0){
sprintf(extra, "Load File efuse=%s,Load File MAC=%s",(pEEPROM->bloadfile_fail_flag? "FAIL" : "OK"),(pEEPROM->bloadmac_fail_flag? "FAIL" : "OK")); sprintf(extra, "Load File efuse=%s,Load File MAC=%s",(pEEPROM->bloadfile_fail_flag? "FAIL" : "OK"),(pEEPROM->bloadmac_fail_flag? "FAIL" : "OK"));
@ -8629,9 +8618,7 @@ exit:
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = org_fw_iol;/* 0:Disable, 1:enable, 2:by usb speed */ padapter->registrypriv.fw_iol = org_fw_iol;/* 0:Disable, 1:enable, 2:by usb speed */
#endif
return err; return err;
} }

4
os_dep/os_intfs.c
View file

@ -220,11 +220,9 @@ static uint rtw_max_roaming_times=2;
module_param(rtw_max_roaming_times, uint, 0644); module_param(rtw_max_roaming_times, uint, 0644);
MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try"); MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
#ifdef CONFIG_IOL
static int rtw_fw_iol=1;/* 0:Disable, 1:enable, 2:by usb speed */ static int rtw_fw_iol=1;/* 0:Disable, 1:enable, 2:by usb speed */
module_param(rtw_fw_iol, int, 0644); module_param(rtw_fw_iol, int, 0644);
MODULE_PARM_DESC(rtw_fw_iol,"FW IOL"); MODULE_PARM_DESC(rtw_fw_iol,"FW IOL");
#endif /* CONFIG_IOL */
#ifdef CONFIG_FILE_FWIMG #ifdef CONFIG_FILE_FWIMG
static char *rtw_fw_file_path= ""; static char *rtw_fw_file_path= "";
@ -369,9 +367,7 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
registry_par->max_roaming_times = (u8)rtw_max_roaming_times + 2; registry_par->max_roaming_times = (u8)rtw_max_roaming_times + 2;
#endif /* CONFIG_INTEL_WIDI */ #endif /* CONFIG_INTEL_WIDI */
#ifdef CONFIG_IOL
registry_par->fw_iol = rtw_fw_iol; registry_par->fw_iol = rtw_fw_iol;
#endif
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
registry_par->enable80211d = (u8)rtw_80211d; registry_par->enable80211d = (u8)rtw_80211d;

2
os_dep/usb_intf.c
View file

@ -748,14 +748,12 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
#ifdef CONFIG_IOL
if(!padapter->bup){ if(!padapter->bup){
u8 bMacPwrCtrlOn = false; u8 bMacPwrCtrlOn = false;
rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
if(bMacPwrCtrlOn) if(bMacPwrCtrlOn)
rtw_hal_power_off(padapter); rtw_hal_power_off(padapter);
} }
#endif
if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{ {