mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +00:00
rtl8188eu: Change all "if(" to "if ("
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
aa89a39a09
commit
6ead3e77dc
61 changed files with 3500 additions and 3500 deletions
|
|
@ -82,42 +82,42 @@ odm_SignalScaleMapping_92CSeries(
|
|||
{
|
||||
s32 RetSig;
|
||||
#if (DEV_BUS_TYPE == RT_PCI_INTERFACE)
|
||||
if(pDM_Odm->SupportInterface == ODM_ITRF_PCIE)
|
||||
if (pDM_Odm->SupportInterface == ODM_ITRF_PCIE)
|
||||
{
|
||||
/* Step 1. Scale mapping. */
|
||||
if(CurrSig >= 61 && CurrSig <= 100)
|
||||
if (CurrSig >= 61 && CurrSig <= 100)
|
||||
{
|
||||
RetSig = 90 + ((CurrSig - 60) / 4);
|
||||
}
|
||||
else if(CurrSig >= 41 && CurrSig <= 60)
|
||||
else if (CurrSig >= 41 && CurrSig <= 60)
|
||||
{
|
||||
RetSig = 78 + ((CurrSig - 40) / 2);
|
||||
}
|
||||
else if(CurrSig >= 31 && CurrSig <= 40)
|
||||
else if (CurrSig >= 31 && CurrSig <= 40)
|
||||
{
|
||||
RetSig = 66 + (CurrSig - 30);
|
||||
}
|
||||
else if(CurrSig >= 21 && CurrSig <= 30)
|
||||
else if (CurrSig >= 21 && CurrSig <= 30)
|
||||
{
|
||||
RetSig = 54 + (CurrSig - 20);
|
||||
}
|
||||
else if(CurrSig >= 5 && CurrSig <= 20)
|
||||
else if (CurrSig >= 5 && CurrSig <= 20)
|
||||
{
|
||||
RetSig = 42 + (((CurrSig - 5) * 2) / 3);
|
||||
}
|
||||
else if(CurrSig == 4)
|
||||
else if (CurrSig == 4)
|
||||
{
|
||||
RetSig = 36;
|
||||
}
|
||||
else if(CurrSig == 3)
|
||||
else if (CurrSig == 3)
|
||||
{
|
||||
RetSig = 27;
|
||||
}
|
||||
else if(CurrSig == 2)
|
||||
else if (CurrSig == 2)
|
||||
{
|
||||
RetSig = 18;
|
||||
}
|
||||
else if(CurrSig == 1)
|
||||
else if (CurrSig == 1)
|
||||
{
|
||||
RetSig = 9;
|
||||
}
|
||||
|
|
@ -129,33 +129,33 @@ odm_SignalScaleMapping_92CSeries(
|
|||
#endif
|
||||
|
||||
#if ((DEV_BUS_TYPE == RT_USB_INTERFACE) ||(DEV_BUS_TYPE == RT_SDIO_INTERFACE))
|
||||
if((pDM_Odm->SupportInterface == ODM_ITRF_USB) || (pDM_Odm->SupportInterface == ODM_ITRF_SDIO) )
|
||||
if ((pDM_Odm->SupportInterface == ODM_ITRF_USB) || (pDM_Odm->SupportInterface == ODM_ITRF_SDIO) )
|
||||
{
|
||||
if(CurrSig >= 51 && CurrSig <= 100)
|
||||
if (CurrSig >= 51 && CurrSig <= 100)
|
||||
{
|
||||
RetSig = 100;
|
||||
}
|
||||
else if(CurrSig >= 41 && CurrSig <= 50)
|
||||
else if (CurrSig >= 41 && CurrSig <= 50)
|
||||
{
|
||||
RetSig = 80 + ((CurrSig - 40)*2);
|
||||
}
|
||||
else if(CurrSig >= 31 && CurrSig <= 40)
|
||||
else if (CurrSig >= 31 && CurrSig <= 40)
|
||||
{
|
||||
RetSig = 66 + (CurrSig - 30);
|
||||
}
|
||||
else if(CurrSig >= 21 && CurrSig <= 30)
|
||||
else if (CurrSig >= 21 && CurrSig <= 30)
|
||||
{
|
||||
RetSig = 54 + (CurrSig - 20);
|
||||
}
|
||||
else if(CurrSig >= 10 && CurrSig <= 20)
|
||||
else if (CurrSig >= 10 && CurrSig <= 20)
|
||||
{
|
||||
RetSig = 42 + (((CurrSig - 10) * 2) / 3);
|
||||
}
|
||||
else if(CurrSig >= 5 && CurrSig <= 9)
|
||||
else if (CurrSig >= 5 && CurrSig <= 9)
|
||||
{
|
||||
RetSig = 22 + (((CurrSig - 5) * 3) / 2);
|
||||
}
|
||||
else if(CurrSig >= 1 && CurrSig <= 4)
|
||||
else if (CurrSig >= 1 && CurrSig <= 4)
|
||||
{
|
||||
RetSig = 6 + (((CurrSig - 1) * 3) / 2);
|
||||
}
|
||||
|
|
@ -173,13 +173,13 @@ odm_SignalScaleMapping(
|
|||
s32 CurrSig
|
||||
)
|
||||
{
|
||||
if( (pDM_Odm->SupportPlatform == ODM_MP) &&
|
||||
if ( (pDM_Odm->SupportPlatform == ODM_MP) &&
|
||||
(pDM_Odm->SupportInterface != ODM_ITRF_PCIE) && /* USB & SDIO */
|
||||
(pDM_Odm->PatchID==10))/* pMgntInfo->CustomerID == RT_CID_819x_Netcore */
|
||||
{
|
||||
return odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(pDM_Odm,CurrSig);
|
||||
}
|
||||
else if( (pDM_Odm->SupportPlatform == ODM_MP) &&
|
||||
else if ( (pDM_Odm->SupportPlatform == ODM_MP) &&
|
||||
(pDM_Odm->SupportInterface == ODM_ITRF_PCIE) &&
|
||||
(pDM_Odm->PatchID==19))/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo) */
|
||||
{
|
||||
|
|
@ -219,15 +219,15 @@ odm_EVMdbToPercentage(
|
|||
|
||||
/* ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x\n", ret_val, ret_val)); */
|
||||
|
||||
if(ret_val >= 0)
|
||||
if (ret_val >= 0)
|
||||
ret_val = 0;
|
||||
if(ret_val <= -33)
|
||||
if (ret_val <= -33)
|
||||
ret_val = -33;
|
||||
|
||||
ret_val = 0 - ret_val;
|
||||
ret_val*=3;
|
||||
|
||||
if(ret_val == 99)
|
||||
if (ret_val == 99)
|
||||
ret_val = 100;
|
||||
|
||||
return(ret_val);
|
||||
|
|
@ -261,7 +261,7 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
|
||||
|
||||
|
||||
if(isCCKrate) {
|
||||
if (isCCKrate) {
|
||||
u8 report;
|
||||
u8 cck_agc_rpt;
|
||||
|
||||
|
|
@ -276,12 +276,12 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
/* 2011.11.28 LukeLee: 88E use different LNA & VGA gain table */
|
||||
/* The RSSI formula should be modified according to the gain table */
|
||||
/* In 88E, cck_highpwr is always set to 1 */
|
||||
if(pDM_Odm->SupportICType & (ODM_RTL8188E|ODM_RTL8812)) {
|
||||
if (pDM_Odm->SupportICType & (ODM_RTL8188E|ODM_RTL8812)) {
|
||||
LNA_idx = ((cck_agc_rpt & 0xE0) >>5);
|
||||
VGA_idx = (cck_agc_rpt & 0x1F);
|
||||
switch(LNA_idx) {
|
||||
case 7:
|
||||
if(VGA_idx <= 27)
|
||||
if (VGA_idx <= 27)
|
||||
rx_pwr_all = -100 + 2*(27-VGA_idx); /* VGA_idx = 27~2 */
|
||||
else
|
||||
rx_pwr_all = -100;
|
||||
|
|
@ -299,7 +299,7 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
rx_pwr_all = -24 + 2*(7-VGA_idx); /* VGA_idx = 7~0 */
|
||||
break;
|
||||
case 2:
|
||||
if(cck_highpwr)
|
||||
if (cck_highpwr)
|
||||
rx_pwr_all = -12 + 2*(5-VGA_idx); /* VGA_idx = 5~0 */
|
||||
else
|
||||
rx_pwr_all = -6+ 2*(5-VGA_idx);
|
||||
|
|
@ -315,19 +315,19 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
}
|
||||
rx_pwr_all += 6;
|
||||
PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
|
||||
if(cck_highpwr == false)
|
||||
if (cck_highpwr == false)
|
||||
{
|
||||
if(PWDB_ALL >= 80)
|
||||
if (PWDB_ALL >= 80)
|
||||
PWDB_ALL = ((PWDB_ALL-80)<<1)+((PWDB_ALL-80)>>1)+80;
|
||||
else if((PWDB_ALL <= 78) && (PWDB_ALL >= 20))
|
||||
else if ((PWDB_ALL <= 78) && (PWDB_ALL >= 20))
|
||||
PWDB_ALL += 3;
|
||||
if(PWDB_ALL>100)
|
||||
if (PWDB_ALL>100)
|
||||
PWDB_ALL = 100;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!cck_highpwr)
|
||||
if (!cck_highpwr)
|
||||
{
|
||||
report =( cck_agc_rpt & 0xc0 )>>6;
|
||||
switch(report)
|
||||
|
|
@ -375,30 +375,30 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
|
||||
|
||||
/* Modification for ext-LNA board */
|
||||
if(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
|
||||
if (pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
|
||||
{
|
||||
if((cck_agc_rpt>>7) == 0){
|
||||
if ((cck_agc_rpt>>7) == 0){
|
||||
PWDB_ALL = (PWDB_ALL>94)?100:(PWDB_ALL +6);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(PWDB_ALL > 38)
|
||||
if (PWDB_ALL > 38)
|
||||
PWDB_ALL -= 16;
|
||||
else
|
||||
PWDB_ALL = (PWDB_ALL<=16)?(PWDB_ALL>>2):(PWDB_ALL -12);
|
||||
}
|
||||
|
||||
/* CCK modification */
|
||||
if(PWDB_ALL > 25 && PWDB_ALL <= 60)
|
||||
if (PWDB_ALL > 25 && PWDB_ALL <= 60)
|
||||
PWDB_ALL += 6;
|
||||
/* else if (PWDB_ALL <= 25) */
|
||||
/* PWDB_ALL += 8; */
|
||||
}
|
||||
else/* Modification for int-LNA board */
|
||||
{
|
||||
if(PWDB_ALL > 99)
|
||||
if (PWDB_ALL > 99)
|
||||
PWDB_ALL -= 8;
|
||||
else if(PWDB_ALL > 50 && PWDB_ALL <= 68)
|
||||
else if (PWDB_ALL > 50 && PWDB_ALL <= 68)
|
||||
PWDB_ALL += 4;
|
||||
}
|
||||
}
|
||||
|
|
@ -409,20 +409,20 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
/* */
|
||||
/* (3) Get Signal Quality (EVM) */
|
||||
/* */
|
||||
if(pPktinfo->bPacketMatchBSSID)
|
||||
if (pPktinfo->bPacketMatchBSSID)
|
||||
{
|
||||
u8 SQ,SQ_rpt;
|
||||
|
||||
if((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */
|
||||
if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */
|
||||
SQ = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,0,0);
|
||||
}
|
||||
else if(pPhyInfo->RxPWDBAll > 40 && !pDM_Odm->bInHctTest){
|
||||
else if (pPhyInfo->RxPWDBAll > 40 && !pDM_Odm->bInHctTest){
|
||||
SQ = 100;
|
||||
}
|
||||
else{
|
||||
SQ_rpt = pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all;
|
||||
|
||||
if(SQ_rpt > 64)
|
||||
if (SQ_rpt > 64)
|
||||
SQ = 0;
|
||||
else if (SQ_rpt < 20)
|
||||
SQ = 100;
|
||||
|
|
@ -460,14 +460,14 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
/* RTPRINT(FRX, RX_PHY_SS, ("RF-%d RXPWR=%x RSSI=%d\n", i, rx_pwr[i], RSSI)); */
|
||||
|
||||
/* Modification for ext-LNA board */
|
||||
if(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
|
||||
if (pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
|
||||
{
|
||||
if((pPhyStaRpt->path_agc[i].trsw) == 1)
|
||||
if ((pPhyStaRpt->path_agc[i].trsw) == 1)
|
||||
RSSI = (RSSI>94)?100:(RSSI +6);
|
||||
else
|
||||
RSSI = (RSSI<=16)?(RSSI>>3):(RSSI -16);
|
||||
|
||||
if((RSSI <= 34) && (RSSI >=4))
|
||||
if ((RSSI <= 34) && (RSSI >=4))
|
||||
RSSI -= 4;
|
||||
}
|
||||
|
||||
|
|
@ -477,11 +477,11 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
pPhyInfo->RxSNR[i] = pDM_Odm->PhyDbgInfo.RxSNRdB[i] = (s32)(pPhyStaRpt->path_rxsnr[i]/2);
|
||||
|
||||
/* Record Signal Strength for next packet */
|
||||
if(pPktinfo->bPacketMatchBSSID)
|
||||
if (pPktinfo->bPacketMatchBSSID)
|
||||
{
|
||||
if((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19))
|
||||
if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19))
|
||||
{
|
||||
if(i==ODM_RF_PATH_A)
|
||||
if (i==ODM_RF_PATH_A)
|
||||
pPhyInfo->SignalQuality = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,i,RSSI);
|
||||
|
||||
}
|
||||
|
|
@ -502,13 +502,13 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
pPhyInfo->RxPower = rx_pwr_all;
|
||||
pPhyInfo->RecvSignalPower = rx_pwr_all;
|
||||
|
||||
if((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){
|
||||
if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){
|
||||
/* do nothing */
|
||||
} else{/* pMgntInfo->CustomerID != RT_CID_819x_Lenovo */
|
||||
/* */
|
||||
/* (3)EVM of HT rate */
|
||||
/* */
|
||||
if(pPktinfo->Rate >=DESC92C_RATEMCS8 && pPktinfo->Rate <=DESC92C_RATEMCS15)
|
||||
if (pPktinfo->Rate >=DESC92C_RATEMCS8 && pPktinfo->Rate <=DESC92C_RATEMCS15)
|
||||
Max_spatial_stream = 2; /* both spatial stream make sense */
|
||||
else
|
||||
Max_spatial_stream = 1; /* only spatial stream 1 makes sense */
|
||||
|
|
@ -522,9 +522,9 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
/* RTPRINT(FRX, RX_PHY_SQ, ("RXRATE=%x RXEVM=%x EVM=%s%d\n", */
|
||||
/* GET_RX_STATUS_DESC_RX_MCS(pDesc), pDrvInfo->rxevm[i], "%", EVM)); */
|
||||
|
||||
if(pPktinfo->bPacketMatchBSSID)
|
||||
if (pPktinfo->bPacketMatchBSSID)
|
||||
{
|
||||
if(i==ODM_RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */
|
||||
if (i==ODM_RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */
|
||||
{
|
||||
pPhyInfo->SignalQuality = (u8)(EVM & 0xff);
|
||||
}
|
||||
|
|
@ -536,7 +536,7 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
}
|
||||
/* UI BSS List signal strength(in percentage), make it good looking, from 0~100. */
|
||||
/* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). */
|
||||
if(isCCKrate)
|
||||
if (isCCKrate)
|
||||
{
|
||||
pPhyInfo->SignalStrength = (u8)(odm_SignalScaleMapping(pDM_Odm, PWDB_ALL));/* PWDB_ALL; */
|
||||
}
|
||||
|
|
@ -580,7 +580,7 @@ odm_Process_RSSIForDM(
|
|||
|
||||
PSTA_INFO_T pEntry;
|
||||
|
||||
if(pPktinfo->StationID == 0xFF)
|
||||
if (pPktinfo->StationID == 0xFF)
|
||||
return;
|
||||
|
||||
/* 2011/11/17 MH Need to debug */
|
||||
|
|
@ -590,35 +590,35 @@ odm_Process_RSSIForDM(
|
|||
}
|
||||
|
||||
pEntry = pDM_Odm->pODM_StaInfo[pPktinfo->StationID];
|
||||
if(!IS_STA_VALID(pEntry))
|
||||
if (!IS_STA_VALID(pEntry))
|
||||
return;
|
||||
if((!pPktinfo->bPacketMatchBSSID) )
|
||||
if ((!pPktinfo->bPacketMatchBSSID) )
|
||||
return;
|
||||
|
||||
isCCKrate = (pPktinfo->Rate <= DESC92C_RATE11M) ? true : false;
|
||||
if(pPktinfo->bPacketBeacon)
|
||||
if (pPktinfo->bPacketBeacon)
|
||||
pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++;
|
||||
|
||||
pDM_Odm->RxRate = pPktinfo->Rate;
|
||||
/* Smart Antenna Debug Message------------------ */
|
||||
if(pDM_Odm->SupportICType == ODM_RTL8188E)
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8188E)
|
||||
{
|
||||
u8 antsel_tr_mux;
|
||||
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
|
||||
|
||||
if(pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)
|
||||
if (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)
|
||||
{
|
||||
if(pDM_FatTable->FAT_State == FAT_TRAINING_STATE)
|
||||
if (pDM_FatTable->FAT_State == FAT_TRAINING_STATE)
|
||||
{
|
||||
if(pPktinfo->bPacketToSelf) /* pPktinfo->bPacketMatchBSSID && (!pPktinfo->bPacketBeacon)) */
|
||||
if (pPktinfo->bPacketToSelf) /* pPktinfo->bPacketMatchBSSID && (!pPktinfo->bPacketBeacon)) */
|
||||
{
|
||||
antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |(pDM_FatTable->antsel_rx_keep_1 <<1) |pDM_FatTable->antsel_rx_keep_0;
|
||||
pDM_FatTable->antSumRSSI[antsel_tr_mux] += pPhyInfo->RxPWDBAll;
|
||||
pDM_FatTable->antRSSIcnt[antsel_tr_mux]++;
|
||||
}
|
||||
}
|
||||
} else if((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)||(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
|
||||
if(pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
|
||||
} else if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)||(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
|
||||
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
|
||||
antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |(pDM_FatTable->antsel_rx_keep_1 <<1) |pDM_FatTable->antsel_rx_keep_0;
|
||||
ODM_AntselStatistics_88E(pDM_Odm, antsel_tr_mux, pPktinfo->StationID, pPhyInfo->RxPWDBAll);
|
||||
}
|
||||
|
|
@ -631,12 +631,12 @@ odm_Process_RSSIForDM(
|
|||
UndecoratedSmoothedOFDM = pEntry->rssi_stat.UndecoratedSmoothedOFDM;
|
||||
UndecoratedSmoothedPWDB = pEntry->rssi_stat.UndecoratedSmoothedPWDB;
|
||||
|
||||
if(pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
|
||||
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
|
||||
{
|
||||
|
||||
if(!isCCKrate)/* ofdm rate */
|
||||
if (!isCCKrate)/* ofdm rate */
|
||||
{
|
||||
if(pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0){
|
||||
if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0){
|
||||
RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
||||
pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
||||
pDM_Odm->RSSI_B = 0;
|
||||
|
|
@ -648,7 +648,7 @@ odm_Process_RSSIForDM(
|
|||
pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
||||
pDM_Odm->RSSI_B = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
|
||||
|
||||
if(pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B])
|
||||
if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B])
|
||||
{
|
||||
RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
||||
RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
|
||||
|
|
@ -658,24 +658,24 @@ odm_Process_RSSIForDM(
|
|||
RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
|
||||
RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
||||
}
|
||||
if((RSSI_max -RSSI_min) < 3)
|
||||
if ((RSSI_max -RSSI_min) < 3)
|
||||
RSSI_Ave = RSSI_max;
|
||||
else if((RSSI_max -RSSI_min) < 6)
|
||||
else if ((RSSI_max -RSSI_min) < 6)
|
||||
RSSI_Ave = RSSI_max - 1;
|
||||
else if((RSSI_max -RSSI_min) < 10)
|
||||
else if ((RSSI_max -RSSI_min) < 10)
|
||||
RSSI_Ave = RSSI_max - 2;
|
||||
else
|
||||
RSSI_Ave = RSSI_max - 3;
|
||||
}
|
||||
|
||||
/* 1 Process OFDM RSSI */
|
||||
if(UndecoratedSmoothedOFDM <= 0) /* initialize */
|
||||
if (UndecoratedSmoothedOFDM <= 0) /* initialize */
|
||||
{
|
||||
UndecoratedSmoothedOFDM = pPhyInfo->RxPWDBAll;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(pPhyInfo->RxPWDBAll > (u32)UndecoratedSmoothedOFDM)
|
||||
if (pPhyInfo->RxPWDBAll > (u32)UndecoratedSmoothedOFDM)
|
||||
{
|
||||
UndecoratedSmoothedOFDM =
|
||||
( ((UndecoratedSmoothedOFDM)*(Rx_Smooth_Factor-1)) +
|
||||
|
|
@ -700,13 +700,13 @@ odm_Process_RSSIForDM(
|
|||
pDM_Odm->RSSI_B = 0xFF;
|
||||
|
||||
/* 1 Process CCK RSSI */
|
||||
if(UndecoratedSmoothedCCK <= 0) /* initialize */
|
||||
if (UndecoratedSmoothedCCK <= 0) /* initialize */
|
||||
{
|
||||
UndecoratedSmoothedCCK = pPhyInfo->RxPWDBAll;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(pPhyInfo->RxPWDBAll > (u32)UndecoratedSmoothedCCK)
|
||||
if (pPhyInfo->RxPWDBAll > (u32)UndecoratedSmoothedCCK)
|
||||
{
|
||||
UndecoratedSmoothedCCK =
|
||||
( ((UndecoratedSmoothedCCK)*(Rx_Smooth_Factor-1)) +
|
||||
|
|
@ -723,10 +723,10 @@ odm_Process_RSSIForDM(
|
|||
pEntry->rssi_stat.PacketMap = pEntry->rssi_stat.PacketMap<<1;
|
||||
}
|
||||
|
||||
/* if(pEntry) */
|
||||
/* if (pEntry) */
|
||||
{
|
||||
/* 2011.07.28 LukeLee: modified to prevent unstable CCK RSSI */
|
||||
if(pEntry->rssi_stat.ValidBit >= 64)
|
||||
if (pEntry->rssi_stat.ValidBit >= 64)
|
||||
pEntry->rssi_stat.ValidBit = 64;
|
||||
else
|
||||
pEntry->rssi_stat.ValidBit++;
|
||||
|
|
@ -734,14 +734,14 @@ odm_Process_RSSIForDM(
|
|||
for(i=0; i<pEntry->rssi_stat.ValidBit; i++)
|
||||
OFDM_pkt += (u8)(pEntry->rssi_stat.PacketMap>>i)&BIT0;
|
||||
|
||||
if(pEntry->rssi_stat.ValidBit == 64)
|
||||
if (pEntry->rssi_stat.ValidBit == 64)
|
||||
{
|
||||
Weighting = ((OFDM_pkt<<4) > 64)?64:(OFDM_pkt<<4);
|
||||
UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(pEntry->rssi_stat.ValidBit != 0)
|
||||
if (pEntry->rssi_stat.ValidBit != 0)
|
||||
UndecoratedSmoothedPWDB = (OFDM_pkt*UndecoratedSmoothedOFDM+(pEntry->rssi_stat.ValidBit-OFDM_pkt)*UndecoratedSmoothedCCK)/pEntry->rssi_stat.ValidBit;
|
||||
else
|
||||
UndecoratedSmoothedPWDB = 0;
|
||||
|
|
@ -778,9 +778,9 @@ ODM_PhyStatusQuery_92CSeries(
|
|||
pPhyStatus,
|
||||
pPktinfo);
|
||||
|
||||
if( pDM_Odm->RSSI_test == true) {
|
||||
if ( pDM_Odm->RSSI_test == true) {
|
||||
/* Select the packets to do RSSI checking for antenna switching. */
|
||||
if(pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon )
|
||||
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon )
|
||||
ODM_SwAntDivChkPerPktRssi(pDM_Odm,pPktinfo->StationID,pPhyInfo);
|
||||
} else {
|
||||
odm_Process_RSSIForDM(pDM_Odm,pPhyInfo,pPktinfo);
|
||||
|
|
@ -842,7 +842,7 @@ ODM_ConfigRFWithHeaderFile(
|
|||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===>ODM_ConfigRFWithHeaderFile\n"));
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8188E)
|
||||
{
|
||||
if(IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
if (IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
READ_AND_CONFIG(8188E,_RadioA_1T_ICUT_);
|
||||
else
|
||||
READ_AND_CONFIG(8188E,_RadioA_1T_);
|
||||
|
|
@ -863,18 +863,18 @@ ODM_ConfigBBWithHeaderFile(
|
|||
ODM_BB_Config_Type ConfigType
|
||||
)
|
||||
{
|
||||
if(pDM_Odm->SupportICType == ODM_RTL8188E) {
|
||||
if(ConfigType == CONFIG_BB_PHY_REG) {
|
||||
if(IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8188E) {
|
||||
if (ConfigType == CONFIG_BB_PHY_REG) {
|
||||
if (IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
READ_AND_CONFIG(8188E,_PHY_REG_1T_ICUT_);
|
||||
else
|
||||
READ_AND_CONFIG(8188E,_PHY_REG_1T_);
|
||||
} else if(ConfigType == CONFIG_BB_AGC_TAB) {
|
||||
if(IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
} else if (ConfigType == CONFIG_BB_AGC_TAB) {
|
||||
if (IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
READ_AND_CONFIG(8188E,_AGC_TAB_1T_ICUT_);
|
||||
else
|
||||
READ_AND_CONFIG(8188E,_AGC_TAB_1T_);
|
||||
} else if(ConfigType == CONFIG_BB_PHY_REG_PG) {
|
||||
} else if (ConfigType == CONFIG_BB_PHY_REG_PG) {
|
||||
READ_AND_CONFIG(8188E,_PHY_REG_PG_);
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> phy_ConfigBBWithHeaderFile() agc:Rtl8188EPHY_REG_PGArray\n"));
|
||||
}
|
||||
|
|
@ -889,7 +889,7 @@ ODM_ConfigMACWithHeaderFile(
|
|||
{
|
||||
u8 result = HAL_STATUS_SUCCESS;
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8188E) {
|
||||
if(IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
if (IS_VENDOR_8188E_I_CUT_SERIES(pDM_Odm->Adapter))
|
||||
READ_AND_CONFIG(8188E,_MAC_REG_ICUT_);
|
||||
else
|
||||
result =READ_AND_CONFIG(8188E,_MAC_REG_);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue