rtl8188eu: Remove configuration variables CONFIG_IOL_XXX and associated dead code

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-14 11:21:05 -05:00
parent 927e984c73
commit 9ba4954378
16 changed files with 36 additions and 672 deletions

View file

@ -40,6 +40,7 @@
#include <rtw_mp.h>
#endif //#ifdef CONFIG_MP_INCLUDED
#include <rtl8188e_hal.h>
#include <rtw_iol.h>
#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)
@ -5732,9 +5733,6 @@ static void rf_reg_dump(_adapter *padapter)
}
}
#ifdef CONFIG_IOL
#include <rtw_iol.h>
#endif
static int rtw_dbg_port(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@ -5829,7 +5827,6 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x78: //IOL test
switch (minor_cmd)
{
#ifdef CONFIG_IOL
case 0x04: //LLT table initialization test
{
u8 page_boundary = 0xf9;
@ -5865,17 +5862,10 @@ static int rtw_dbg_port(struct net_device *dev,
}
for (i=0;i<blink_num;i++){
#ifdef CONFIG_IOL_NEW_GENERATION
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x00,0xff);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x08,0xff);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
#else
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x00);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
rtw_IOL_append_WB_cmd(xmit_frame, reg, 0x08);
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, blink_delay_ms);
#endif
}
if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, (blink_delay_ms*blink_num*2)+200,0))
ret = -EPERM;
@ -5899,13 +5889,8 @@ static int rtw_dbg_port(struct net_device *dev,
break;
}
for (i=0;i<write_num;i++){
#ifdef CONFIG_IOL_NEW_GENERATION
for (i=0;i<write_num;i++)
rtw_IOL_append_WB_cmd(xmit_frame, reg, i+start_value,0xFF);
#else
rtw_IOL_append_WB_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM;
}
@ -5935,13 +5920,8 @@ static int rtw_dbg_port(struct net_device *dev,
break;
}
for (i=0;i<write_num;i++){
#ifdef CONFIG_IOL_NEW_GENERATION
for (i=0;i<write_num;i++)
rtw_IOL_append_WW_cmd(xmit_frame, reg, i+start_value,0xFFFF);
#else
rtw_IOL_append_WW_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM;
}
@ -5971,13 +5951,8 @@ static int rtw_dbg_port(struct net_device *dev,
break;
}
for (i=0;i<write_num;i++){
#ifdef CONFIG_IOL_NEW_GENERATION
for (i=0;i<write_num;i++)
rtw_IOL_append_WD_cmd(xmit_frame, reg, i+start_value,0xFFFFFFFF);
#else
rtw_IOL_append_WD_cmd(xmit_frame, reg, i+start_value);
#endif
}
if (_SUCCESS !=rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 5000,0))
ret = -EPERM;
@ -5990,7 +5965,6 @@ static int rtw_dbg_port(struct net_device *dev,
}
}
break;
#endif //CONFIG_IOL
}
break;
case 0x79:
@ -7856,9 +7830,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
u16 i=0, j=0, mapLen=0, addr=0, cnts=0;
u16 max_available_size=0, raw_cursize=0, raw_maxsize=0;
int err;
#ifdef CONFIG_IOL
u8 org_fw_iol = padapter->registrypriv.fw_iol;// 0:Disable, 1:enable, 2:by usb speed
#endif
wrqu = (struct iw_point*)wdata;
pwrctrlpriv = &padapter->pwrctrlpriv;
@ -7904,9 +7876,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
tmp[i] = token;
i++;
}
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = 0;// 0:Disable, 1:enable, 2:by usb speed
#endif
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"));
@ -8311,9 +8281,7 @@ exit:
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode);
#endif
#ifdef CONFIG_IOL
padapter->registrypriv.fw_iol = org_fw_iol;// 0:Disable, 1:enable, 2:by usb speed
#endif
return err;
}

View file

@ -220,11 +220,9 @@ static uint rtw_max_roaming_times=2;
module_param(rtw_max_roaming_times, uint, 0644);
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
module_param(rtw_fw_iol, int, 0644);
MODULE_PARM_DESC(rtw_fw_iol,"FW IOL");
#endif //CONFIG_IOL
#ifdef CONFIG_FILE_FWIMG
char *rtw_fw_file_path= "";
@ -737,9 +735,7 @@ _func_enter_;
registry_par->max_roaming_times = (u8)rtw_max_roaming_times;
#ifdef CONFIG_IOL
registry_par->fw_iol = rtw_fw_iol;
#endif
#ifdef CONFIG_80211D
registry_par->enable80211d = (u8)rtw_80211d;