mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-07 05:53:06 +00:00
rtl8188eu: Remove "if 1" statements
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
35044413a3
commit
4f92869c5b
10 changed files with 127 additions and 270 deletions
|
|
@ -599,7 +599,6 @@ ODM_RAInfo_Init(
|
|||
)
|
||||
{
|
||||
struct odm_ra_info *pRaInfo = &pDM_Odm->RAInfo[MacID];
|
||||
#if 1
|
||||
u1Byte WirelessMode=0xFF; /* invalid value */
|
||||
u1Byte max_rate_idx = 0x13; /* MCS7 */
|
||||
if (pDM_Odm->pWirelessMode!=NULL){
|
||||
|
|
@ -622,11 +621,6 @@ ODM_RAInfo_Init(
|
|||
pRaInfo->DecisionRate = max_rate_idx;
|
||||
pRaInfo->PreRate = max_rate_idx;
|
||||
pRaInfo->HighestRate=max_rate_idx;
|
||||
#else
|
||||
pRaInfo->DecisionRate = 0x13;
|
||||
pRaInfo->PreRate = 0x13;
|
||||
pRaInfo->HighestRate= 0x13;
|
||||
#endif
|
||||
pRaInfo->LowestRate=0;
|
||||
pRaInfo->RateID=0;
|
||||
pRaInfo->RateMask=0xffffffff;
|
||||
|
|
|
|||
|
|
@ -1749,7 +1749,6 @@ if (*(pDM_Odm->mp_mode) != 1)
|
|||
continue;
|
||||
|
||||
tmpReg = APK_RF_init_value[path][index];
|
||||
#if 1
|
||||
if (!pDM_Odm->RFCalibrateInfo.bAPKThermalMeterIgnore)
|
||||
{
|
||||
BB_offset = (tmpReg & 0xF0000) >> 16;
|
||||
|
|
@ -1776,7 +1775,6 @@ if (*(pDM_Odm->mp_mode) != 1)
|
|||
}
|
||||
tmpReg = (tmpReg & 0xFFF0FFFF) | (BB_offset << 16);
|
||||
}
|
||||
#endif
|
||||
|
||||
ODM_SetRFReg(pDM_Odm, path, RF_IPA_A, bMaskDWord, 0x8992e);
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("phy_APCalibrate_8188E() offset 0xc %x\n", PHY_QueryRFReg(pAdapter, path, RF_IPA_A, bMaskDWord)));
|
||||
|
|
|
|||
14
hal/odm.c
14
hal/odm.c
|
|
@ -2714,18 +2714,9 @@ odm_InitHybridAntDiv(
|
|||
}
|
||||
|
||||
|
||||
bool
|
||||
odm_StaDefAntSel(
|
||||
struct odm_dm_struct *pDM_Odm,
|
||||
u4Byte OFDM_Ant1_Cnt,
|
||||
u4Byte OFDM_Ant2_Cnt,
|
||||
u4Byte CCK_Ant1_Cnt,
|
||||
u4Byte CCK_Ant2_Cnt,
|
||||
u1Byte *pDefAnt
|
||||
|
||||
)
|
||||
bool odm_StaDefAntSel(struct odm_dm_struct *pDM_Odm, u4Byte OFDM_Ant1_Cnt,
|
||||
u4Byte OFDM_Ant2_Cnt, u4Byte CCK_Ant1_Cnt, u4Byte CCK_Ant2_Cnt, u1Byte *pDefAnt)
|
||||
{
|
||||
#if 1
|
||||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("odm_StaDefAntSelect==============>\n"));
|
||||
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("OFDM_Ant1_Cnt:%d, OFDM_Ant2_Cnt:%d\n",OFDM_Ant1_Cnt,OFDM_Ant2_Cnt));
|
||||
|
|
@ -2760,7 +2751,6 @@ odm_StaDefAntSel(
|
|||
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("TxAnt = %s\n",((*pDefAnt)==1)?"Ant1":"Ant2"));
|
||||
|
||||
#endif
|
||||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("<==============odm_StaDefAntSelect\n"));
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -2832,114 +2832,96 @@ GetHalDefVar8188EUsb(
|
|||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||
u8 bResult = _SUCCESS;
|
||||
|
||||
switch (eVariable)
|
||||
{
|
||||
case HAL_DEF_UNDERCORATEDSMOOTHEDPWDB:
|
||||
#if 1 /* trunk */
|
||||
switch (eVariable) {
|
||||
case HAL_DEF_UNDERCORATEDSMOOTHEDPWDB:
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
||||
struct sta_priv * pstapriv = &Adapter->stapriv;
|
||||
struct sta_info * psta;
|
||||
psta = rtw_get_stainfo(pstapriv, pmlmepriv->cur_network.network.MacAddress);
|
||||
if (psta)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
||||
struct sta_priv * pstapriv = &Adapter->stapriv;
|
||||
struct sta_info * psta;
|
||||
psta = rtw_get_stainfo(pstapriv, pmlmepriv->cur_network.network.MacAddress);
|
||||
if (psta)
|
||||
{
|
||||
*((int *)pValue) = psta->rssi_stat.UndecoratedSmoothedPWDB;
|
||||
}
|
||||
*((int *)pValue) = psta->rssi_stat.UndecoratedSmoothedPWDB;
|
||||
}
|
||||
#else /* V4 branch */
|
||||
if (check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == true){
|
||||
*((int *)pValue) = pHalData->dmpriv.UndecoratedSmoothedPWDB;
|
||||
}
|
||||
else{
|
||||
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case HAL_DEF_IS_SUPPORT_ANT_DIV:
|
||||
*((u8 *)pValue) = (pHalData->AntDivCfg==0)?false:true;
|
||||
break;
|
||||
case HAL_DEF_CURRENT_ANTENNA:
|
||||
*(( u8*)pValue) = pHalData->CurAntenna;
|
||||
break;
|
||||
case HAL_DEF_DRVINFO_SZ:
|
||||
*(( u32*)pValue) = DRVINFO_SZ;
|
||||
break;
|
||||
case HAL_DEF_MAX_RECVBUF_SZ:
|
||||
*(( u32*)pValue) = MAX_RECVBUF_SZ;
|
||||
break;
|
||||
case HAL_DEF_RX_PACKET_OFFSET:
|
||||
*(( u32*)pValue) = RXDESC_SIZE + DRVINFO_SZ;
|
||||
break;
|
||||
|
||||
case HAL_DEF_DBG_DM_FUNC:
|
||||
*(( u32*)pValue) =pHalData->odmpriv.SupportAbility;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case HAL_DEF_IS_SUPPORT_ANT_DIV:
|
||||
*((u8 *)pValue) = (pHalData->AntDivCfg==0)?false:true;
|
||||
break;
|
||||
case HAL_DEF_CURRENT_ANTENNA:
|
||||
*(( u8*)pValue) = pHalData->CurAntenna;
|
||||
break;
|
||||
case HAL_DEF_DRVINFO_SZ:
|
||||
*(( u32*)pValue) = DRVINFO_SZ;
|
||||
break;
|
||||
case HAL_DEF_MAX_RECVBUF_SZ:
|
||||
*(( u32*)pValue) = MAX_RECVBUF_SZ;
|
||||
break;
|
||||
case HAL_DEF_RX_PACKET_OFFSET:
|
||||
*(( u32*)pValue) = RXDESC_SIZE + DRVINFO_SZ;
|
||||
break;
|
||||
case HAL_DEF_DBG_DM_FUNC:
|
||||
*(( u32*)pValue) =pHalData->odmpriv.SupportAbility;
|
||||
break;
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
case HAL_DEF_RA_DECISION_RATE:
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetDecisionRate_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
break;
|
||||
|
||||
case HAL_DEF_RA_SGI:
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetShortGI_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
break;
|
||||
case HAL_DEF_RA_DECISION_RATE:
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetDecisionRate_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
break;
|
||||
case HAL_DEF_RA_SGI:
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetShortGI_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
||||
case HAL_DEF_PT_PWR_STATUS:
|
||||
case HAL_DEF_PT_PWR_STATUS:
|
||||
#if (POWER_TRAINING_ACTIVE==1)
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetHwPwrStatus_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
{
|
||||
u8 MacID = *((u8*)pValue);
|
||||
*((u8*)pValue) = ODM_RA_GetHwPwrStatus_8188E(&(pHalData->odmpriv), MacID);
|
||||
}
|
||||
#endif/* POWER_TRAINING_ACTIVE==1) */
|
||||
break;
|
||||
|
||||
case HW_VAR_MAX_RX_AMPDU_FACTOR:
|
||||
*(( u32*)pValue) = MAX_AMPDU_FACTOR_64K;
|
||||
break;
|
||||
|
||||
case HW_DEF_RA_INFO_DUMP:
|
||||
break;
|
||||
case HW_VAR_MAX_RX_AMPDU_FACTOR:
|
||||
*(( u32*)pValue) = MAX_AMPDU_FACTOR_64K;
|
||||
break;
|
||||
case HW_DEF_RA_INFO_DUMP:
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
{
|
||||
u8 entry_id = *((u8*)pValue);
|
||||
if (check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== true)
|
||||
{
|
||||
u8 entry_id = *((u8*)pValue);
|
||||
if (check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== true)
|
||||
{
|
||||
DBG_88E("============ RA status check ===================\n");
|
||||
DBG_88E("Mac_id:%d ,RateID = %d,RAUseRate = 0x%08x,RateSGI = %d, DecisionRate = 0x%02x ,PTStage = %d\n",
|
||||
entry_id,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RateID,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RAUseRate,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RateSGI,
|
||||
pHalData->odmpriv.RAInfo[entry_id].DecisionRate,
|
||||
pHalData->odmpriv.RAInfo[entry_id].PTStage);
|
||||
}
|
||||
DBG_88E("============ RA status check ===================\n");
|
||||
DBG_88E("Mac_id:%d ,RateID = %d,RAUseRate = 0x%08x,RateSGI = %d, DecisionRate = 0x%02x ,PTStage = %d\n",
|
||||
entry_id,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RateID,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RAUseRate,
|
||||
pHalData->odmpriv.RAInfo[entry_id].RateSGI,
|
||||
pHalData->odmpriv.RAInfo[entry_id].DecisionRate,
|
||||
pHalData->odmpriv.RAInfo[entry_id].PTStage);
|
||||
}
|
||||
}
|
||||
#endif /* RATE_ADAPTIVE_SUPPORT == 1) */
|
||||
break;
|
||||
case HW_DEF_ODM_DBG_FLAG:
|
||||
{
|
||||
u8Byte DebugComponents = *((u32*)pValue);
|
||||
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
|
||||
printk("pDM_Odm->DebugComponents = 0x%llx\n",pDM_Odm->DebugComponents );
|
||||
}
|
||||
break;
|
||||
|
||||
case HAL_DEF_DBG_DUMP_RXPKT:
|
||||
*(( u8*)pValue) = pHalData->bDumpRxPkt;
|
||||
break;
|
||||
case HAL_DEF_DBG_DUMP_TXPKT:
|
||||
*(( u8*)pValue) = pHalData->bDumpTxPkt;
|
||||
break;
|
||||
|
||||
default:
|
||||
bResult = _FAIL;
|
||||
break;
|
||||
break;
|
||||
case HW_DEF_ODM_DBG_FLAG:
|
||||
{
|
||||
u8Byte DebugComponents = *((u32*)pValue);
|
||||
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
|
||||
printk("pDM_Odm->DebugComponents = 0x%llx\n",pDM_Odm->DebugComponents );
|
||||
}
|
||||
break;
|
||||
case HAL_DEF_DBG_DUMP_RXPKT:
|
||||
*(( u8*)pValue) = pHalData->bDumpRxPkt;
|
||||
break;
|
||||
case HAL_DEF_DBG_DUMP_TXPKT:
|
||||
*(( u8*)pValue) = pHalData->bDumpTxPkt;
|
||||
break;
|
||||
default:
|
||||
bResult = _FAIL;
|
||||
break;
|
||||
}
|
||||
|
||||
return bResult;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue