mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-22 04:23:39 +00:00
rtl8188eu: CONFIG_DISABLE_ODM is always undefined
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
b31b2b3874
commit
37c29a6af7
2 changed files with 13 additions and 28 deletions
|
@ -176,13 +176,8 @@ static void Init_ODM_ComInfo_88E(PADAPTER Adapter)
|
||||||
|
|
||||||
ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType);
|
ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType);
|
||||||
|
|
||||||
#ifdef CONFIG_DISABLE_ODM
|
pdmpriv->InitODMFlag = ODM_RF_CALIBRATION |
|
||||||
pdmpriv->InitODMFlag = 0;
|
ODM_RF_TX_PWR_TRACK;
|
||||||
#else
|
|
||||||
pdmpriv->InitODMFlag = ODM_RF_CALIBRATION |
|
|
||||||
ODM_RF_TX_PWR_TRACK /* */
|
|
||||||
;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag);
|
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag);
|
||||||
|
|
||||||
|
@ -196,23 +191,19 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter)
|
||||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||||
int i;
|
int i;
|
||||||
#ifdef CONFIG_DISABLE_ODM
|
|
||||||
pdmpriv->InitODMFlag = 0;
|
|
||||||
#else /* CONFIG_DISABLE_ODM */
|
|
||||||
|
|
||||||
pdmpriv->InitODMFlag = ODM_BB_DIG |
|
pdmpriv->InitODMFlag = ODM_BB_DIG |
|
||||||
#ifdef CONFIG_ODM_REFRESH_RAMASK
|
#ifdef CONFIG_ODM_REFRESH_RAMASK
|
||||||
ODM_BB_RA_MASK |
|
ODM_BB_RA_MASK |
|
||||||
#endif
|
#endif
|
||||||
ODM_BB_DYNAMIC_TXPWR |
|
ODM_BB_DYNAMIC_TXPWR |
|
||||||
ODM_BB_FA_CNT |
|
ODM_BB_FA_CNT |
|
||||||
ODM_BB_RSSI_MONITOR |
|
ODM_BB_RSSI_MONITOR |
|
||||||
ODM_BB_CCK_PD |
|
ODM_BB_CCK_PD |
|
||||||
ODM_BB_PWR_SAVE |
|
ODM_BB_PWR_SAVE |
|
||||||
ODM_MAC_EDCA_TURBO |
|
ODM_MAC_EDCA_TURBO |
|
||||||
ODM_RF_CALIBRATION |
|
ODM_RF_CALIBRATION |
|
||||||
ODM_RF_TX_PWR_TRACK
|
ODM_RF_TX_PWR_TRACK ;
|
||||||
;
|
|
||||||
if (pHalData->AntDivCfg)
|
if (pHalData->AntDivCfg)
|
||||||
pdmpriv->InitODMFlag |= ODM_BB_ANT_DIV;
|
pdmpriv->InitODMFlag |= ODM_BB_ANT_DIV;
|
||||||
|
|
||||||
|
@ -224,7 +215,6 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter)
|
||||||
}
|
}
|
||||||
#endif/* MP_DRIVER==1) */
|
#endif/* MP_DRIVER==1) */
|
||||||
|
|
||||||
#endif/* CONFIG_DISABLE_ODM */
|
|
||||||
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag);
|
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag);
|
||||||
|
|
||||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_TX_UNI,&(Adapter->xmitpriv.tx_bytes));
|
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_TX_UNI,&(Adapter->xmitpriv.tx_bytes));
|
||||||
|
@ -312,13 +302,9 @@ _record_initrate:
|
||||||
|
|
||||||
|
|
||||||
/* ODM */
|
/* ODM */
|
||||||
if (hw_init_completed == true)
|
if (hw_init_completed == true) {
|
||||||
{
|
|
||||||
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
||||||
u8 bLinked=false;
|
u8 bLinked=false;
|
||||||
#ifdef CONFIG_DISABLE_ODM
|
|
||||||
pHalData->odmpriv.SupportAbility = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ( (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ||
|
if ( (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ||
|
||||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true))
|
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == true))
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
//***** temporarily flag *******
|
//***** temporarily flag *******
|
||||||
|
|
||||||
//#define CONFIG_DISABLE_ODM
|
|
||||||
#define CONFIG_ODM_REFRESH_RAMASK
|
#define CONFIG_ODM_REFRESH_RAMASK
|
||||||
#define CONFIG_PHY_SETTING_WITH_ODM
|
#define CONFIG_PHY_SETTING_WITH_ODM
|
||||||
//for FPGA VERIFICATION config
|
//for FPGA VERIFICATION config
|
||||||
|
|
Loading…
Reference in a new issue