mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +00:00
rtl8188eu: Remove remainder of code that depends on DM_ODM_SUPPORT_TYPE
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
78015aef77
commit
3a518f1886
12 changed files with 152 additions and 9400 deletions
|
|
@ -71,52 +71,6 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
|
|||
)
|
||||
{
|
||||
s4Byte RetSig;
|
||||
#if (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
//if(pDM_Odm->SupportInterface == ODM_ITRF_PCIE)
|
||||
{
|
||||
// Step 1. Scale mapping.
|
||||
// 20100611 Joseph: Re-tunning RSSI presentation for Lenovo.
|
||||
// 20100426 Joseph: Modify Signal strength mapping.
|
||||
// This modification makes the RSSI indication similar to Intel solution.
|
||||
// 20100414 Joseph: Tunning RSSI for Lenovo according to RTL8191SE.
|
||||
if(CurrSig >= 54 && CurrSig <= 100)
|
||||
{
|
||||
RetSig = 100;
|
||||
}
|
||||
else if(CurrSig>=42 && CurrSig <= 53 )
|
||||
{
|
||||
RetSig = 95;
|
||||
}
|
||||
else if(CurrSig>=36 && CurrSig <= 41 )
|
||||
{
|
||||
RetSig = 74 + ((CurrSig - 36) *20)/6;
|
||||
}
|
||||
else if(CurrSig>=33 && CurrSig <= 35 )
|
||||
{
|
||||
RetSig = 65 + ((CurrSig - 33) *8)/2;
|
||||
}
|
||||
else if(CurrSig>=18 && CurrSig <= 32 )
|
||||
{
|
||||
RetSig = 62 + ((CurrSig - 18) *2)/15;
|
||||
}
|
||||
else if(CurrSig>=15 && CurrSig <= 17 )
|
||||
{
|
||||
RetSig = 33 + ((CurrSig - 15) *28)/2;
|
||||
}
|
||||
else if(CurrSig>=10 && CurrSig <= 14 )
|
||||
{
|
||||
RetSig = 39;
|
||||
}
|
||||
else if(CurrSig>=8 && CurrSig <= 9 )
|
||||
{
|
||||
RetSig = 33;
|
||||
}
|
||||
else if(CurrSig <= 8 )
|
||||
{
|
||||
RetSig = 19;
|
||||
}
|
||||
}
|
||||
#endif //ENDIF (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
return RetSig;
|
||||
}
|
||||
|
||||
|
|
@ -127,56 +81,6 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
|
|||
)
|
||||
{
|
||||
s4Byte RetSig;
|
||||
#if (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
//if(pDM_Odm->SupportInterface == ODM_ITRF_USB)
|
||||
{
|
||||
// Netcore request this modification because 2009.04.13 SU driver use it.
|
||||
if(CurrSig >= 31 && CurrSig <= 100)
|
||||
{
|
||||
RetSig = 100;
|
||||
}
|
||||
else if(CurrSig >= 21 && CurrSig <= 30)
|
||||
{
|
||||
RetSig = 90 + ((CurrSig - 20) / 1);
|
||||
}
|
||||
else if(CurrSig >= 11 && CurrSig <= 20)
|
||||
{
|
||||
RetSig = 80 + ((CurrSig - 10) / 1);
|
||||
}
|
||||
else if(CurrSig >= 7 && CurrSig <= 10)
|
||||
{
|
||||
RetSig = 69 + (CurrSig - 7);
|
||||
}
|
||||
else if(CurrSig == 6)
|
||||
{
|
||||
RetSig = 54;
|
||||
}
|
||||
else if(CurrSig == 5)
|
||||
{
|
||||
RetSig = 45;
|
||||
}
|
||||
else if(CurrSig == 4)
|
||||
{
|
||||
RetSig = 36;
|
||||
}
|
||||
else if(CurrSig == 3)
|
||||
{
|
||||
RetSig = 27;
|
||||
}
|
||||
else if(CurrSig == 2)
|
||||
{
|
||||
RetSig = 18;
|
||||
}
|
||||
else if(CurrSig == 1)
|
||||
{
|
||||
RetSig = 9;
|
||||
}
|
||||
else
|
||||
{
|
||||
RetSig = CurrSig;
|
||||
}
|
||||
}
|
||||
#endif //ENDIF (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
return RetSig;
|
||||
}
|
||||
|
||||
|
|
@ -308,39 +212,6 @@ static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(
|
|||
)
|
||||
{
|
||||
u1Byte SQ;
|
||||
#if (DM_ODM_SUPPORT_TYPE & ODM_MP)
|
||||
// mapping to 5 bars for vista signal strength
|
||||
// signal quality in driver will be displayed to signal strength
|
||||
if(isCCKrate){
|
||||
// in vista.
|
||||
if(PWDB_ALL >= 50)
|
||||
SQ = 100;
|
||||
else if(PWDB_ALL >= 35 && PWDB_ALL < 50)
|
||||
SQ = 80;
|
||||
else if(PWDB_ALL >= 22 && PWDB_ALL < 35)
|
||||
SQ = 60;
|
||||
else if(PWDB_ALL >= 18 && PWDB_ALL < 22)
|
||||
SQ = 40;
|
||||
else
|
||||
SQ = 20;
|
||||
}
|
||||
else{//OFDM rate
|
||||
|
||||
// mapping to 5 bars for vista signal strength
|
||||
// signal quality in driver will be displayed to signal strength
|
||||
// in vista.
|
||||
if(RSSI >= 50)
|
||||
SQ = 100;
|
||||
else if(RSSI >= 35 && RSSI < 50)
|
||||
SQ = 80;
|
||||
else if(RSSI >= 22 && RSSI < 35)
|
||||
SQ = 60;
|
||||
else if(RSSI >= 18 && RSSI < 22)
|
||||
SQ = 40;
|
||||
else
|
||||
SQ = 20;
|
||||
}
|
||||
#endif
|
||||
return SQ;
|
||||
}
|
||||
|
||||
|
|
@ -554,10 +425,8 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
}
|
||||
|
||||
pPhyInfo->RxPWDBAll = PWDB_ALL;
|
||||
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE))
|
||||
pPhyInfo->BTRxRSSIPercentage = PWDB_ALL;
|
||||
pPhyInfo->RecvSignalPower = rx_pwr_all;
|
||||
#endif
|
||||
//
|
||||
// (3) Get Signal Quality (EVM)
|
||||
//
|
||||
|
|
@ -607,9 +476,7 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
|
||||
rx_pwr[i] = ((pPhyStaRpt->path_agc[i].gain& 0x3F)*2) - 110;
|
||||
|
||||
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE))
|
||||
pPhyInfo->RxPwr[i] = rx_pwr[i];
|
||||
#endif
|
||||
|
||||
/* Translate DBM to percentage. */
|
||||
RSSI = odm_QueryRxPwrPercentage(rx_pwr[i]);
|
||||
|
|
@ -630,10 +497,8 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
|
||||
pPhyInfo->RxMIMOSignalStrength[i] =(u1Byte) RSSI;
|
||||
|
||||
#if (DM_ODM_SUPPORT_TYPE & (/*ODM_MP|*/ODM_CE|ODM_AP|ODM_ADSL))
|
||||
//Get Rx snr value in DB
|
||||
pPhyInfo->RxSNR[i] = pDM_Odm->PhyDbgInfo.RxSNRdB[i] = (s4Byte)(pPhyStaRpt->path_rxsnr[i]/2);
|
||||
#endif
|
||||
|
||||
/* Record Signal Strength for next packet */
|
||||
if(pPktinfo->bPacketMatchBSSID)
|
||||
|
|
@ -653,23 +518,17 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
// (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive)
|
||||
//
|
||||
rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >> 1 )& 0x7f) -110;
|
||||
//RTPRINT(FRX, RX_PHY_SS, ("PWDB_ALL=%d\n", PWDB_ALL));
|
||||
|
||||
PWDB_ALL_BT = PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
|
||||
//RTPRINT(FRX, RX_PHY_SS, ("PWDB_ALL=%d\n",PWDB_ALL));
|
||||
|
||||
pPhyInfo->RxPWDBAll = PWDB_ALL;
|
||||
//ODM_RT_TRACE(pDM_Odm,ODM_COMP_RSSI_MONITOR, ODM_DBG_LOUD, ("ODM OFDM RSSI=%d\n",pPhyInfo->RxPWDBAll));
|
||||
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE))
|
||||
pPhyInfo->BTRxRSSIPercentage = PWDB_ALL_BT;
|
||||
pPhyInfo->RxPower = rx_pwr_all;
|
||||
pPhyInfo->RecvSignalPower = rx_pwr_all;
|
||||
#endif
|
||||
|
||||
if((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){
|
||||
//do nothing
|
||||
}
|
||||
else{//pMgntInfo->CustomerID != RT_CID_819x_Lenovo
|
||||
} else{//pMgntInfo->CustomerID != RT_CID_819x_Lenovo
|
||||
//
|
||||
// (3)EVM of HT rate
|
||||
//
|
||||
|
|
@ -678,8 +537,7 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
else
|
||||
Max_spatial_stream = 1; //only spatial stream 1 makes sense
|
||||
|
||||
for(i=0; i<Max_spatial_stream; i++)
|
||||
{
|
||||
for(i=0; i<Max_spatial_stream; i++) {
|
||||
// Do not use shift operation like "rx_evmX >>= 1" because the compilor of free build environment
|
||||
// fill most significant bit to "zero" when doing shifting operation which may change a negative
|
||||
// value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore.
|
||||
|
|
@ -700,31 +558,19 @@ odm_RxPhyStatus92CSeries_Parsing(
|
|||
}
|
||||
|
||||
}
|
||||
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE))
|
||||
//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 (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
// 2012/01/12 MH Use customeris signal strength from HalComRxdDesc.c/
|
||||
pPhyInfo->SignalStrength = (u1Byte)(SignalScaleMapping(pDM_Odm->Adapter, PWDB_ALL));//PWDB_ALL;
|
||||
#else
|
||||
pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(pDM_Odm, PWDB_ALL));//PWDB_ALL;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
if (rf_rx_num != 0)
|
||||
{
|
||||
#if (DM_ODM_SUPPORT_TYPE == ODM_MP)
|
||||
// 2012/01/12 MH Use customeris signal strength from HalComRxdDesc.c/
|
||||
pPhyInfo->SignalStrength = (u1Byte)(SignalScaleMapping(pDM_Odm->Adapter, total_rssi/=rf_rx_num));//PWDB_ALL;
|
||||
#else
|
||||
pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(pDM_Odm, total_rssi/=rf_rx_num));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//For 92C/92D HW (Hybrid) Antenna Diversity
|
||||
#if(defined(CONFIG_HW_ANTENNA_DIVERSITY))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue