mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 16:44:20 +00:00
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
parent
927e984c73
commit
9ba4954378
16 changed files with 36 additions and 672 deletions
|
|
@ -22,14 +22,9 @@
|
|||
#include <drv_conf.h>
|
||||
#include <osdep_service.h>
|
||||
#include <drv_types.h>
|
||||
|
||||
#ifdef CONFIG_IOL
|
||||
#include <rtw_iol.h>
|
||||
#endif
|
||||
|
||||
#include <rtl8188e_hal.h>
|
||||
|
||||
|
||||
/*---------------------------Define Local Constant---------------------------*/
|
||||
/* Channel switch:The size of command tables for switch channel*/
|
||||
#define MAX_PRECMD_CNT 16
|
||||
|
|
@ -638,26 +633,10 @@ phy_ConfigMACWithHeaderFile(
|
|||
ArrayLength = Rtl8188E_MAC_ArrayLength;
|
||||
ptrArray = (u32*)Rtl8188E_MAC_Array;
|
||||
|
||||
#ifdef CONFIG_IOL_MAC
|
||||
{
|
||||
struct xmit_frame *xmit_frame;
|
||||
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL)
|
||||
return _FAIL;
|
||||
|
||||
for (i = 0 ;i < ArrayLength;i=i+2){ /* Add by tynli for 2 column */
|
||||
rtw_IOL_append_WB_cmd(xmit_frame, ptrArray[i], (u8)ptrArray[i+1]);
|
||||
}
|
||||
|
||||
return rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
|
||||
}
|
||||
#else
|
||||
for (i = 0 ;i < ArrayLength;i=i+2){ /* Add by tynli for 2 column */
|
||||
rtw_write8(Adapter, ptrArray[i], (u8)ptrArray[i+1]);
|
||||
}
|
||||
#endif
|
||||
|
||||
return _SUCCESS;
|
||||
|
||||
}
|
||||
#endif /* ifndef CONFIG_PHY_SETTING_WITH_ODM */
|
||||
|
||||
|
|
@ -913,41 +892,6 @@ phy_ConfigBBWithHeaderFile(
|
|||
|
||||
if (ConfigType == CONFIG_BB_PHY_REG)
|
||||
{
|
||||
#ifdef CONFIG_IOL_BB_PHY_REG
|
||||
{
|
||||
struct xmit_frame *xmit_frame;
|
||||
u32 tmp_value;
|
||||
|
||||
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
|
||||
ret = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
for (i=0;i<PHY_REGArrayLen;i=i+2)
|
||||
{
|
||||
tmp_value=Rtl819XPHY_REGArray_Table[i+1];
|
||||
|
||||
if (Rtl819XPHY_REGArray_Table[i] == 0xfe)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xfd)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xfc)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xfb)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xfa)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xf9)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
|
||||
else if (Rtl819XPHY_REGArray_Table[i] == 0xa24)
|
||||
podmpriv->RFCalibrateInfo.RegA24 = Rtl819XPHY_REGArray_Table[i+1];
|
||||
|
||||
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XPHY_REGArray_Table[i], tmp_value);
|
||||
}
|
||||
|
||||
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
|
||||
}
|
||||
#else
|
||||
for (i=0;i<PHY_REGArrayLen;i=i+2)
|
||||
{
|
||||
if (Rtl819XPHY_REGArray_Table[i] == 0xfe){
|
||||
|
|
@ -971,29 +915,11 @@ phy_ConfigBBWithHeaderFile(
|
|||
/* Add 1us delay between BB/RF register setting. */
|
||||
rtw_udelay_os(1);
|
||||
}
|
||||
#endif
|
||||
/* for External PA */
|
||||
phy_ConfigBBExternalPA(Adapter);
|
||||
}
|
||||
else if (ConfigType == CONFIG_BB_AGC_TAB)
|
||||
{
|
||||
#ifdef CONFIG_IOL_BB_AGC_TAB
|
||||
{
|
||||
struct xmit_frame *xmit_frame;
|
||||
|
||||
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
|
||||
ret = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
for (i=0;i<AGCTAB_ArrayLen;i=i+2)
|
||||
{
|
||||
rtw_IOL_append_WD_cmd(xmit_frame, Rtl819XAGCTAB_Array_Table[i], Rtl819XAGCTAB_Array_Table[i+1]);
|
||||
}
|
||||
|
||||
ret = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
|
||||
}
|
||||
#else
|
||||
for (i=0;i<AGCTAB_ArrayLen;i=i+2)
|
||||
{
|
||||
PHY_SetBBReg(Adapter, Rtl819XAGCTAB_Array_Table[i], bMaskDWord, Rtl819XAGCTAB_Array_Table[i+1]);
|
||||
|
|
@ -1001,7 +927,6 @@ phy_ConfigBBWithHeaderFile(
|
|||
/* Add 1us delay between BB/RF register setting. */
|
||||
rtw_udelay_os(1);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
exit:
|
||||
|
|
@ -1391,42 +1316,6 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
|
|||
switch (eRFPath)
|
||||
{
|
||||
case RF_PATH_A:
|
||||
#ifdef CONFIG_IOL_RF_RF_PATH_A
|
||||
{
|
||||
struct xmit_frame *xmit_frame;
|
||||
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
|
||||
rtStatus = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
for (i = 0;i<RadioA_ArrayLen; i=i+2)
|
||||
{
|
||||
if (Rtl819XRadioA_Array_Table[i] == 0xfe)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XRadioA_Array_Table[i] == 0xfd)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XRadioA_Array_Table[i] == 0xfc)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
|
||||
else if (Rtl819XRadioA_Array_Table[i] == 0xfb)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XRadioA_Array_Table[i] == 0xfa)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XRadioA_Array_Table[i] == 0xf9)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
|
||||
else
|
||||
{
|
||||
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
|
||||
u32 NewOffset = 0;
|
||||
u32 DataAndAddr = 0;
|
||||
|
||||
NewOffset = Rtl819XRadioA_Array_Table[i] & 0x3f;
|
||||
DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioA_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; /* T65 RF */
|
||||
rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr);
|
||||
}
|
||||
}
|
||||
rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
|
||||
}
|
||||
#else
|
||||
for (i = 0;i<RadioA_ArrayLen; i=i+2)
|
||||
{
|
||||
if (Rtl819XRadioA_Array_Table[i] == 0xfe) {
|
||||
|
|
@ -1449,47 +1338,10 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
|
|||
rtw_udelay_os(1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* Add for High Power PA */
|
||||
PHY_ConfigRFExternalPA(Adapter, eRFPath);
|
||||
break;
|
||||
case RF_PATH_B:
|
||||
#ifdef CONFIG_IOL_RF_RF_PATH_B
|
||||
{
|
||||
struct xmit_frame *xmit_frame;
|
||||
if ((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) {
|
||||
rtStatus = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
for (i = 0;i<RadioB_ArrayLen; i=i+2)
|
||||
{
|
||||
if (Rtl819XRadioB_Array_Table[i] == 0xfe)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XRadioB_Array_Table[i] == 0xfd)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XRadioB_Array_Table[i] == 0xfc)
|
||||
rtw_IOL_append_DELAY_MS_cmd(xmit_frame, 1);
|
||||
else if (Rtl819XRadioB_Array_Table[i] == 0xfb)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 50);
|
||||
else if (Rtl819XRadioB_Array_Table[i] == 0xfa)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 5);
|
||||
else if (Rtl819XRadioB_Array_Table[i] == 0xf9)
|
||||
rtw_IOL_append_DELAY_US_cmd(xmit_frame, 1);
|
||||
else
|
||||
{
|
||||
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
|
||||
u32 NewOffset = 0;
|
||||
u32 DataAndAddr = 0;
|
||||
|
||||
NewOffset = Rtl819XRadioB_Array_Table[i] & 0x3f;
|
||||
DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioB_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; /* T65 RF */
|
||||
rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr);
|
||||
}
|
||||
}
|
||||
rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000,0);
|
||||
}
|
||||
#else
|
||||
for (i = 0;i<RadioB_ArrayLen; i=i+2)
|
||||
{
|
||||
if (Rtl819XRadioB_Array_Table[i] == 0xfe)
|
||||
|
|
@ -1513,7 +1365,6 @@ rtl8188e_PHY_ConfigRFWithHeaderFile(
|
|||
rtw_udelay_os(1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case RF_PATH_C:
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue