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

rtl8188eu: Remove RTL8XXXY_SUPPORT symbols and associated dead code

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-21 18:06:56 -05:00
parent 1079016261
commit 8b0cf8ad5b
7 changed files with 18 additions and 447 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

365
hal/odm.c
View file

@ -343,12 +343,6 @@ odm_DynamicTxPower_92C(
PDM_ODM_T pDM_Odm PDM_ODM_T pDM_Odm
); );
void
odm_DynamicTxPower_92D(
PDM_ODM_T pDM_Odm
);
void void
odm_RSSIMonitorInit( odm_RSSIMonitorInit(
PDM_ODM_T pDM_Odm PDM_ODM_T pDM_Odm
@ -538,16 +532,12 @@ ODM_DMInit(
} }
else if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) else if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES)
{ {
#if (RTL8188E_SUPPORT == 1)
odm_PrimaryCCA_Init(pDM_Odm); /* Gary */ odm_PrimaryCCA_Init(pDM_Odm); /* Gary */
#endif
odm_DynamicBBPowerSavingInit(pDM_Odm); odm_DynamicBBPowerSavingInit(pDM_Odm);
odm_DynamicTxPowerInit(pDM_Odm); odm_DynamicTxPowerInit(pDM_Odm);
odm_TXPowerTrackingInit(pDM_Odm); odm_TXPowerTrackingInit(pDM_Odm);
ODM_EdcaTurboInit(pDM_Odm); ODM_EdcaTurboInit(pDM_Odm);
#if (RTL8188E_SUPPORT == 1)
ODM_RAInfo_Init_all(pDM_Odm); ODM_RAInfo_Init_all(pDM_Odm);
#endif
if ( ( pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV ) || if ( ( pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV ) ||
( pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV ) || ( pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV ) ||
( pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV )) ( pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV ))
@ -609,13 +599,8 @@ ODM_DMWatchdog(
odm_RefreshRateAdaptiveMask(pDM_Odm); odm_RefreshRateAdaptiveMask(pDM_Odm);
#if (RTL8192D_SUPPORT == 1)
ODM_DynamicEarlyMode(pDM_Odm);
#endif
odm_DynamicBBPowerSaving(pDM_Odm); odm_DynamicBBPowerSaving(pDM_Odm);
#if (RTL8188E_SUPPORT == 1)
odm_DynamicPrimaryCCA(pDM_Odm); odm_DynamicPrimaryCCA(pDM_Odm);
#endif
if ( ( pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV ) || if ( ( pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV ) ||
( pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV ) || ( pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV ) ||
( pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV )) ( pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV ))
@ -1055,18 +1040,6 @@ odm_CmnInfoHook_Debug(
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth=%d\n",*(pDM_Odm->pBandWidth)) ); ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth=%d\n",*(pDM_Odm->pBandWidth)) );
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel=%d\n",*(pDM_Odm->pChannel)) ); ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel=%d\n",*(pDM_Odm->pChannel)) );
#if (RTL8192D_SUPPORT==1)
if (pDM_Odm->pBandType)
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandType=%d\n",*(pDM_Odm->pBandType)) );
if (pDM_Odm->pMacPhyMode)
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pMacPhyMode=%d\n",*(pDM_Odm->pMacPhyMode)) );
if (pDM_Odm->pBuddyAdapter)
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbGetValueFromOtherMac=%d\n",*(pDM_Odm->pbGetValueFromOtherMac)) );
if (pDM_Odm->pBuddyAdapter)
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBuddyAdapter=%p\n",*(pDM_Odm->pBuddyAdapter)) );
if (pDM_Odm->pbMasterOfDMSP)
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbMasterOfDMSP=%d\n",*(pDM_Odm->pbMasterOfDMSP)) );
#endif
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess=%d\n",*(pDM_Odm->pbScanInProcess)) ); ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess=%d\n",*(pDM_Odm->pbScanInProcess)) );
ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbPowerSaving=%d\n",*(pDM_Odm->pbPowerSaving)) ); ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbPowerSaving=%d\n",*(pDM_Odm->pbPowerSaving)) );
@ -1478,7 +1451,6 @@ odm_DIG(
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() : pDM_Odm->RSSI_Min=%d\n",pDM_Odm->RSSI_Min)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() : pDM_Odm->RSSI_Min=%d\n",pDM_Odm->RSSI_Min));
} }
/* 1 Lower Bound for 88E AntDiv */ /* 1 Lower Bound for 88E AntDiv */
#if (RTL8188E_SUPPORT == 1)
else if ((pDM_Odm->SupportICType == ODM_RTL8188E)&&(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) else if ((pDM_Odm->SupportICType == ODM_RTL8188E)&&(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))
{ {
if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)
@ -1487,7 +1459,6 @@ odm_DIG(
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max));
} }
} }
#endif
else else
{ {
DIG_Dynamic_MIN=dm_dig_min; DIG_Dynamic_MIN=dm_dig_min;
@ -1635,49 +1606,11 @@ odm_DIG(
/* 2 High power RSSI threshold */ /* 2 High power RSSI threshold */
#if (RTL8192D_SUPPORT==1)
if (pDM_Odm->SupportICType == ODM_RTL8192D)
{
/* sherry delete DualMacSmartConncurrent 20110517 */
if (*(pDM_Odm->pMacPhyMode) == ODM_DMSP)
{
ODM_Write_DIG_DMSP(pDM_Odm, CurrentIGI);/* ODM_Write_DIG_DMSP(pDM_Odm, pDM_DigTable->CurIGValue); */
if (*(pDM_Odm->pbMasterOfDMSP))
{
pDM_DigTable->bMediaConnect_0 = pDM_Odm->bLinked;
pDM_DigTable->DIG_Dynamic_MIN_0 = DIG_Dynamic_MIN;
}
else
{
pDM_DigTable->bMediaConnect_1 = pDM_Odm->bLinked;
pDM_DigTable->DIG_Dynamic_MIN_1 = DIG_Dynamic_MIN;
}
}
else
{
ODM_Write_DIG(pDM_Odm, CurrentIGI);/* ODM_Write_DIG(pDM_Odm, pDM_DigTable->CurIGValue); */
if (*(pDM_Odm->pBandType) == ODM_BAND_5G)
{
pDM_DigTable->bMediaConnect_0 = pDM_Odm->bLinked;
pDM_DigTable->DIG_Dynamic_MIN_0 = DIG_Dynamic_MIN;
}
else
{
pDM_DigTable->bMediaConnect_1 = pDM_Odm->bLinked;
pDM_DigTable->DIG_Dynamic_MIN_1 = DIG_Dynamic_MIN;
}
}
}
else
#endif
{
ODM_Write_DIG(pDM_Odm, CurrentIGI);/* ODM_Write_DIG(pDM_Odm, pDM_DigTable->CurIGValue); */ ODM_Write_DIG(pDM_Odm, CurrentIGI);/* ODM_Write_DIG(pDM_Odm, pDM_DigTable->CurIGValue); */
pDM_DigTable->bMediaConnect_0 = pDM_Odm->bLinked; pDM_DigTable->bMediaConnect_0 = pDM_Odm->bLinked;
pDM_DigTable->DIG_Dynamic_MIN_0 = DIG_Dynamic_MIN; pDM_DigTable->DIG_Dynamic_MIN_0 = DIG_Dynamic_MIN;
} }
}
/* 3============================================================ */ /* 3============================================================ */
/* 3 FASLE ALARM CHECK */ /* 3 FASLE ALARM CHECK */
/* 3============================================================ */ /* 3============================================================ */
@ -1715,20 +1648,12 @@ odm_FalseAlarmCounterStatistics(
FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail + FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail +
FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail; FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail;
#if (RTL8188E_SUPPORT==1)
if (pDM_Odm->SupportICType == ODM_RTL8188E) { if (pDM_Odm->SupportICType == ODM_RTL8188E) {
ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_SC_CNT_11N, bMaskDWord); ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_SC_CNT_11N, bMaskDWord);
FalseAlmCnt->Cnt_BW_LSC = (ret_value&0xffff); FalseAlmCnt->Cnt_BW_LSC = (ret_value&0xffff);
FalseAlmCnt->Cnt_BW_USC = ((ret_value&0xffff0000)>>16); FalseAlmCnt->Cnt_BW_USC = ((ret_value&0xffff0000)>>16);
} }
#endif
#if (RTL8192D_SUPPORT==1)
if (pDM_Odm->SupportICType == ODM_RTL8192D)
odm_GetCCKFalseAlarm_92D(pDM_Odm);
else
#endif
{
/* hold cck counter */ /* hold cck counter */
ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT12, 1); ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT12, 1);
ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT14, 1); ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT14, 1);
@ -1740,7 +1665,6 @@ odm_FalseAlarmCounterStatistics(
ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_CCA_CNT_11N, bMaskDWord); ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_CCA_CNT_11N, bMaskDWord);
FalseAlmCnt->Cnt_CCK_CCA = ((ret_value&0xFF)<<8) |((ret_value&0xFF00)>>8); FalseAlmCnt->Cnt_CCK_CCA = ((ret_value&0xFF)<<8) |((ret_value&0xFF00)>>8);
}
FalseAlmCnt->Cnt_all = ( FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_all = ( FalseAlmCnt->Cnt_Fast_Fsync +
FalseAlmCnt->Cnt_SB_Search_fail + FalseAlmCnt->Cnt_SB_Search_fail +
@ -1752,18 +1676,7 @@ odm_FalseAlarmCounterStatistics(
FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA; FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA;
#if (RTL8192C_SUPPORT==1) if (pDM_Odm->SupportICType >=ODM_RTL8723A) {
if (pDM_Odm->SupportICType == ODM_RTL8192C)
odm_ResetFACounter_92C(pDM_Odm);
#endif
#if (RTL8192D_SUPPORT==1)
if (pDM_Odm->SupportICType == ODM_RTL8192D)
odm_ResetFACounter_92D(pDM_Odm);
#endif
if (pDM_Odm->SupportICType >=ODM_RTL8723A)
{
/* reset false alarm counter registers */ /* reset false alarm counter registers */
ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_RSTC_11N, BIT31, 1); ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_RSTC_11N, BIT31, 1);
ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_RSTC_11N, BIT31, 0); ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_RSTC_11N, BIT31, 0);
@ -1850,11 +1763,6 @@ odm_CCKPacketDetectionThresh(
CurCCK_CCAThres = 0x40; CurCCK_CCAThres = 0x40;
} }
#if (RTL8192D_SUPPORT==1)
if (pDM_Odm->SupportICType == ODM_RTL8192D)
ODM_Write_CCK_CCA_Thres_92D(pDM_Odm, CurCCK_CCAThres);
else
#endif
ODM_Write_CCK_CCA_Thres(pDM_Odm, CurCCK_CCAThres); ODM_Write_CCK_CCA_Thres(pDM_Odm, CurCCK_CCAThres);
} }
@ -2325,16 +2233,6 @@ odm_DynamicTxPowerInit(
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
pdmpriv->bDynamicTxPowerEnable = false; pdmpriv->bDynamicTxPowerEnable = false;
#if (RTL8192C_SUPPORT==1)
if (pHalData->BoardType == BOARD_USB_High_PA) {
odm_DynamicTxPowerSavePowerIndex(pDM_Odm);
pdmpriv->bDynamicTxPowerEnable = true;
}
else
#endif
pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal; pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal;
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
} }
@ -2424,19 +2322,7 @@ void odm_DynamicTxPowerNIC(PDM_ODM_T pDM_Odm)
if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)) if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR))
return; return;
if (pDM_Odm->SupportICType == ODM_RTL8192C) if (pDM_Odm->SupportICType == ODM_RTL8188E)
{
odm_DynamicTxPower_92C(pDM_Odm);
}
else if (pDM_Odm->SupportICType == ODM_RTL8192D)
{
odm_DynamicTxPower_92D(pDM_Odm);
}
else if (pDM_Odm->SupportICType & ODM_RTL8188E)
{
/* Add Later. */
}
else if (pDM_Odm->SupportICType == ODM_RTL8188E)
{ {
/* ??? */ /* ??? */
/* This part need to be redefined. */ /* This part need to be redefined. */
@ -2451,214 +2337,10 @@ odm_DynamicTxPowerAP(
{ {
} }
void void odm_DynamicTxPower_92C(PDM_ODM_T pDM_Odm)
odm_DynamicTxPower_92C(
PDM_ODM_T pDM_Odm
)
{ {
#if (RTL8192C_SUPPORT==1)
PADAPTER Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
int UndecoratedSmoothedPWDB;
if (!pdmpriv->bDynamicTxPowerEnable)
return;
/* STA not connected and AP not connected */
if ((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) {
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* the LastDTPlvl should reset when disconnect, */
/* otherwise the tx power level wouldn't change when disconnect and connect again. */
/* Maddest 20091220. */
pdmpriv->LastDTPLvl=TxHighPwrLevel_Normal;
return;
} }
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) /* Default port */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
else /* associated entry pwdb */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2;
else if ((UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL2-3)) &&
(UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL1) )
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1;
else if (UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL1-5))
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) ) {
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) /* HP1 -> Normal or HP2 -> Normal */
odm_DynamicTxPowerRestorePowerIndex(pDM_Odm);
else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1)
odm_DynamicTxPowerWritePowerIndex(pDM_Odm, 0x14);
else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2)
odm_DynamicTxPowerWritePowerIndex(pDM_Odm, 0x10);
}
pdmpriv->LastDTPLvl = pdmpriv->DynamicTxHighPowerLvl;
#endif
}
void odm_DynamicTxPower_92D(PDM_ODM_T pDM_Odm)
{
#if (RTL8192D_SUPPORT==1)
PADAPTER Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
DM_ODM_T *podmpriv = &pHalData->odmpriv;
int UndecoratedSmoothedPWDB;
#if (RTL8192D_EASY_SMART_CONCURRENT == 1)
PADAPTER BuddyAdapter = Adapter->BuddyAdapter;
bool bGetValueFromBuddyAdapter = DualMacGetParameterFromBuddyAdapter(Adapter);
u8 HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1;
#endif
/* If dynamic high power is disabled. */
if ( (pdmpriv->bDynamicTxPowerEnable != true) ||
(!(podmpriv->SupportAbility& ODM_BB_DYNAMIC_TXPWR)) )
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
return;
}
/* STA not connected and AP not connected */
if ((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0))
{
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("Not connected to any\n")); */
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* the LastDTPlvl should reset when disconnect, */
/* otherwise the tx power level wouldn't change when disconnect and connect again. */
/* Maddest 20091220. */
pdmpriv->LastDTPLvl=TxHighPwrLevel_Normal;
return;
}
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) /* Default port */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
else /* associated entry pwdb */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x\n", UndecoratedSmoothedPWDB)); */
}
#if TX_POWER_FOR_5G_BAND == 1
if (pHalData->CurrentBandType92D == BAND_ON_5G){
if (UndecoratedSmoothedPWDB >= 0x33)
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("5G:TxHighPwrLevel_Level2 (TxPwr=0x0)\n")); */
}
else if ((UndecoratedSmoothedPWDB <0x33) &&
(UndecoratedSmoothedPWDB >= 0x2b) )
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("5G:TxHighPwrLevel_Level1 (TxPwr=0x10)\n")); */
}
else if (UndecoratedSmoothedPWDB < 0x2b)
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("5G:TxHighPwrLevel_Normal\n")); */
}
}
else
#endif
{
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Level1 (TxPwr=0x0)\n")); */
}
else if ((UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL2-3)) &&
(UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL1) )
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Level1 (TxPwr=0x10)\n")); */
}
else if (UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL1-5))
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Normal\n")); */
}
}
#if (RTL8192D_EASY_SMART_CONCURRENT == 1)
if (bGetValueFromBuddyAdapter)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 1\n")); */
if (Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() change value\n")); */
HighPowerLvlBackForMac0 = pHalData->DynamicTxHighPowerLvl;
pHalData->DynamicTxHighPowerLvl = Adapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP;
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
pHalData->DynamicTxHighPowerLvl = HighPowerLvlBackForMac0;
Adapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = false;
}
}
#endif
if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) )
{
/* ODM_RT_TRACE(pDM_Odm,COMP_HIPWR, DBG_LOUD, ("PHY_SetTxPowerLevel8192S() Channel = %d\n" , pHalData->CurrentChannel)); */
#if (RTL8192D_EASY_SMART_CONCURRENT == 1)
if (BuddyAdapter == NULL)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter == NULL case\n")); */
if (!Adapter->bSlaveOfDMSP)
{
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
}
}
else
{
if (pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMSP\n")); */
if (Adapter->bSlaveOfDMSP)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() bslave case\n")); */
BuddyAdapter->DualMacDMSPControl.bChangeTxHighPowerLvlForAnotherMacOfDMSP = true;
BuddyAdapter->DualMacDMSPControl.CurTxHighLvlForAnotherMacOfDMSP = pHalData->DynamicTxHighPowerLvl;
}
else
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() master case\n")); */
if (!bGetValueFromBuddyAdapter)
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() mac 0 for mac 0\n")); */
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
}
}
}
else
{
/* ODM_RT_TRACE(pDM_Odm,COMP_MLME,DBG_LOUD,("dm_DynamicTxPower() BuddyAdapter DMDP\n")); */
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
}
}
#else
PHY_SetTxPowerLevel8192D(Adapter, pHalData->CurrentChannel);
#endif
}
pdmpriv->LastDTPLvl = pdmpriv->DynamicTxHighPowerLvl;
#endif
}
/* 3============================================================ */ /* 3============================================================ */
/* 3 RSSI Monitor */ /* 3 RSSI Monitor */
/* 3============================================================ */ /* 3============================================================ */
@ -2752,9 +2434,6 @@ FindMinimumRSSI(
{ {
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
} }
#if (RTL8192D_SUPPORT==1)
FindMinimumRSSI_Dmsp(pAdapter);
#endif
} }
void void
@ -2790,11 +2469,7 @@ odm_RSSIMonitorCheckCE(
if (psta->rssi_stat.UndecoratedSmoothedPWDB > tmpEntryMaxPWDB) if (psta->rssi_stat.UndecoratedSmoothedPWDB > tmpEntryMaxPWDB)
tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)) { if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)) {
#if (RTL8192D_SUPPORT==1)
PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) | ((Adapter->stapriv.asoc_sta_count+1) << 8));
#else
PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) ); PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) );
#endif
} }
} }
} }
@ -2803,14 +2478,9 @@ odm_RSSIMonitorCheckCE(
if (PWDB_rssi[i] != (0)){ if (PWDB_rssi[i] != (0)){
if (pHalData->fw_ractrl == true)/* Report every sta's RSSI to FW */ if (pHalData->fw_ractrl == true)/* Report every sta's RSSI to FW */
{ {
#if (RTL8192D_SUPPORT==1)
FillH2CCmd92D(Adapter, H2C_RSSI_REPORT, 3, (u8 *)(&PWDB_rssi[i]));
#elif ((RTL8192C_SUPPORT==1)||(RTL8723A_SUPPORT==1))
rtl8192c_set_rssi_cmd(Adapter, (u8*)&PWDB_rssi[i]);
#endif
} }
else{ else{
#if ((RTL8188E_SUPPORT==1)&&(RATE_ADAPTIVE_SUPPORT == 1)) #if (RATE_ADAPTIVE_SUPPORT == 1)
ODM_RA_SetRSSI_8188E( ODM_RA_SetRSSI_8188E(
&(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF)); &(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));
#endif #endif
@ -2872,10 +2542,7 @@ ODM_ReleaseAllTimers(
{ {
ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer); ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer);
#if (RTL8188E_SUPPORT == 1)
ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->FastAntTrainingTimer); ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->FastAntTrainingTimer);
#endif
} }
/* 3============================================================ */ /* 3============================================================ */
@ -2953,17 +2620,6 @@ odm_TXPowerTrackingCheckCE(
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; PADAPTER Adapter = pDM_Odm->Adapter;
#if ( (RTL8192C_SUPPORT==1) || (RTL8723A_SUPPORT==1) )
rtl8192c_odm_CheckTXPowerTracking(Adapter);
#endif
#if (RTL8192D_SUPPORT==1)
#if (RTL8192D_EASY_SMART_CONCURRENT == 1)
if (!Adapter->bSlaveOfDMSP)
#endif
rtl8192d_odm_CheckTXPowerTracking(Adapter);
#endif
#if (RTL8188E_SUPPORT==1)
if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK))
{ {
@ -2983,7 +2639,6 @@ odm_TXPowerTrackingCheckCE(
odm_TXPowerTrackingCallback_ThermalMeter_8188E(Adapter); odm_TXPowerTrackingCallback_ThermalMeter_8188E(Adapter);
pDM_Odm->RFCalibrateInfo.TM_Trigger = 0; pDM_Odm->RFCalibrateInfo.TM_Trigger = 0;
} }
#endif
} }
void void
@ -3118,17 +2773,11 @@ odm_InitHybridAntDiv(
if (pDM_Odm->SupportICType & (ODM_RTL8192C | ODM_RTL8192D)) if (pDM_Odm->SupportICType & (ODM_RTL8192C | ODM_RTL8192D))
{ {
#if ((RTL8192C_SUPPORT == 1)||(RTL8192D_SUPPORT == 1))
odm_InitHybridAntDiv_88C_92D(pDM_Odm);
#endif
} }
else if (pDM_Odm->SupportICType == ODM_RTL8188E) else if (pDM_Odm->SupportICType == ODM_RTL8188E)
{ {
#if (RTL8188E_SUPPORT == 1)
ODM_AntennaDiversityInit_88E(pDM_Odm); ODM_AntennaDiversityInit_88E(pDM_Odm);
#endif
} }
} }
@ -3334,17 +2983,11 @@ odm_HwAntDiv(
if (pDM_Odm->SupportICType & (ODM_RTL8192C | ODM_RTL8192D)) if (pDM_Odm->SupportICType & (ODM_RTL8192C | ODM_RTL8192D))
{ {
#if ((RTL8192C_SUPPORT == 1)||(RTL8192D_SUPPORT == 1))
odm_HwAntDiv_92C_92D(pDM_Odm);
#endif
} }
else if (pDM_Odm->SupportICType == ODM_RTL8188E) else if (pDM_Odm->SupportICType == ODM_RTL8188E)
{ {
#if (RTL8188E_SUPPORT == 1)
ODM_AntennaDiversity_88E(pDM_Odm); ODM_AntennaDiversity_88E(pDM_Odm);
#endif
} }
} }
/* */ /* */

15
hal/odm_HWConfig.c
View file

@ -607,21 +607,7 @@ static void odm_Process_RSSIForDM(
isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false; isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
#if ((RTL8192C_SUPPORT == 1) ||(RTL8192D_SUPPORT == 1))
if (pDM_Odm->SupportICType & ODM_RTL8192C|ODM_RTL8192D)
{
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
{
/* if (pPktinfo->bPacketBeacon) */
/* */
/* DbgPrint("This is beacon, isCCKrate=%d\n", isCCKrate); */
/* */
ODM_AntselStatistics_88C(pDM_Odm, pPktinfo->StationID, pPhyInfo->RxPWDBAll, isCCKrate);
}
}
#endif
/* Smart Antenna Debug Message------------------ */ /* Smart Antenna Debug Message------------------ */
#if (RTL8188E_SUPPORT == 1)
if (pDM_Odm->SupportICType == ODM_RTL8188E) if (pDM_Odm->SupportICType == ODM_RTL8188E)
{ {
u1Byte antsel_tr_mux; u1Byte antsel_tr_mux;
@ -656,7 +642,6 @@ static void odm_Process_RSSIForDM(
} }
} }
#endif
/* Smart Antenna Debug Message------------------ */ /* Smart Antenna Debug Message------------------ */
UndecoratedSmoothedCCK = pEntry->rssi_stat.UndecoratedSmoothedCCK; UndecoratedSmoothedCCK = pEntry->rssi_stat.UndecoratedSmoothedCCK;

4
include/Hal8188EPhyReg.h
View file

@ -418,14 +418,10 @@
#define RF_TX_BB1 0x23 // #define RF_TX_BB1 0x23 //
//#if HARDWARE_TYPE_IS_RTL8192D == 1
#define RF_T_METER_92D 0x42 // #define RF_T_METER_92D 0x42 //
//#else
#define RF_T_METER_88E 0x42 // #define RF_T_METER_88E 0x42 //
#define RF_T_METER 0x24 // #define RF_T_METER 0x24 //
//#endif
#define RF_SYN_G1 0x25 // RF TX Power control #define RF_SYN_G1 0x25 // RF TX Power control
#define RF_SYN_G2 0x26 // RF TX Power control #define RF_SYN_G2 0x26 // RF TX Power control
#define RF_SYN_G3 0x27 // RF TX Power control #define RF_SYN_G3 0x27 // RF TX Power control

15
include/autoconf.h
View file

@ -90,21 +90,6 @@
* Outsource Related Config * Outsource Related Config
*/ */
#define RTL8192CE_SUPPORT 0
#define RTL8192CU_SUPPORT 0
#define RTL8192C_SUPPORT (RTL8192CE_SUPPORT|RTL8192CU_SUPPORT)
#define RTL8192DE_SUPPORT 0
#define RTL8192DU_SUPPORT 0
#define RTL8192D_SUPPORT (RTL8192DE_SUPPORT|RTL8192DU_SUPPORT)
#define RTL8723AU_SUPPORT 0
#define RTL8723AS_SUPPORT 0
#define RTL8723AE_SUPPORT 0
#define RTL8723A_SUPPORT (RTL8723AU_SUPPORT|RTL8723AS_SUPPORT|RTL8723AE_SUPPORT)
#define RTL8723_FPGA_VERIFICATION 0
#define RTL8188EE_SUPPORT 0 #define RTL8188EE_SUPPORT 0
#define RTL8188EU_SUPPORT 1 #define RTL8188EU_SUPPORT 1
#define RTL8188ES_SUPPORT 0 #define RTL8188ES_SUPPORT 0

10
include/odm.h
View file

@ -296,11 +296,7 @@ typedef struct _ODM_RATE_ADAPTIVE
#define IQK_MAC_REG_NUM 4 #define IQK_MAC_REG_NUM 4
#define IQK_ADDA_REG_NUM 16 #define IQK_ADDA_REG_NUM 16
#define IQK_BB_REG_NUM_MAX 10 #define IQK_BB_REG_NUM_MAX 10
#if (RTL8192D_SUPPORT==1)
#define IQK_BB_REG_NUM 10
#else
#define IQK_BB_REG_NUM 9 #define IQK_BB_REG_NUM 9
#endif
#define HP_THERMAL_NUM 8 #define HP_THERMAL_NUM 8
#define AVG_THERMAL_NUM 8 #define AVG_THERMAL_NUM 8
@ -609,12 +605,6 @@ typedef enum tag_ODM_RF_Type_Definition
// ODM Dynamic common info value definition // ODM Dynamic common info value definition
// //
//typedef enum _MACPHY_MODE_8192D{
// SINGLEMAC_SINGLEPHY,
// DUALMAC_DUALPHY,
// DUALMAC_SINGLEPHY,
//}MACPHY_MODE_8192D,*PMACPHY_MODE_8192D;
// Above is the original define in MP driver. Please use the same define. THX.
typedef enum tag_ODM_MAC_PHY_Mode_Definition typedef enum tag_ODM_MAC_PHY_Mode_Definition
{ {
ODM_SMSP = 0, ODM_SMSP = 0,

17
include/odm_precomp.h
View file

@ -52,22 +52,6 @@
#include "odm_interface.h" #include "odm_interface.h"
#include "odm_reg.h" #include "odm_reg.h"
#if (RTL8192C_SUPPORT==1)
#include "rtl8192c/odm_RTL8192C.h"
#endif
#if (RTL8192D_SUPPORT==1)
#include "rtl8192d/odm_RTL8192D.h"
#endif
#if (RTL8723A_SUPPORT==1)
#include "rtl8723a/HalHWImg8723A_MAC.h"
#include "rtl8723a/HalHWImg8723A_RF.h"
#include "rtl8723a/HalHWImg8723A_BB.h"
#include "rtl8723a/HalHWImg8723A_FW.h"
#include "rtl8723a/odm_RegConfig8723A.h"
#endif
#if (RTL8188E_SUPPORT==1)
#include "HalHWImg8188E_MAC.h" #include "HalHWImg8188E_MAC.h"
#include "HalHWImg8188E_RF.h" #include "HalHWImg8188E_RF.h"
#include "HalHWImg8188E_BB.h" #include "HalHWImg8188E_BB.h"
@ -87,6 +71,5 @@
#include "odm_RegConfig8188E.h" #include "odm_RegConfig8188E.h"
#include "odm_RTL8188E.h" #include "odm_RTL8188E.h"
#endif
#endif // __ODM_PRECOMP_H__ #endif // __ODM_PRECOMP_H__

11
os_dep/os_intfs.c
View file

@ -211,8 +211,6 @@ int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev); int netdev_open (struct net_device *pnetdev);
static int netdev_close (struct net_device *pnetdev); static int netdev_close (struct net_device *pnetdev);
#define RTL8192C_PROC_NAME "rtl819xC"
#define RTL8192D_PROC_NAME "rtl819xD"
static char rtw_proc_name[IFNAMSIZ]; static char rtw_proc_name[IFNAMSIZ];
static struct proc_dir_entry *rtw_proc = NULL; static struct proc_dir_entry *rtw_proc = NULL;
static int rtw_proc_cnt = 0; static int rtw_proc_cnt = 0;
@ -238,15 +236,6 @@ void rtw_proc_init_one(struct net_device *dev)
u8 rf_type; u8 rf_type;
if (rtw_proc == NULL) { if (rtw_proc == NULL) {
if (padapter->chip_type == RTL8188C_8192C)
_rtw_memcpy(rtw_proc_name, RTL8192C_PROC_NAME, sizeof(RTL8192C_PROC_NAME));
else if (padapter->chip_type == RTL8192D)
_rtw_memcpy(rtw_proc_name, RTL8192D_PROC_NAME, sizeof(RTL8192D_PROC_NAME));
else if (padapter->chip_type == RTL8723A)
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
else if (padapter->chip_type == RTL8188E)
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
else
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))