|
@@ -106,8 +106,8 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
|
|
|
|
|
|
isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
|
|
|
|
|
|
- pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1;
|
|
|
- pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
|
|
|
+ pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = -1;
|
|
|
+ pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;
|
|
|
|
|
|
if (isCCKrate) {
|
|
|
u8 cck_agc_rpt;
|
|
@@ -190,15 +190,15 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
|
|
|
SQ = ((64-SQ_rpt) * 100) / 44;
|
|
|
}
|
|
|
pPhyInfo->SignalQuality = SQ;
|
|
|
- pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = SQ;
|
|
|
- pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
|
|
|
+ pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = SQ;
|
|
|
+ pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;
|
|
|
}
|
|
|
} else { /* is OFDM rate */
|
|
|
dm_odm->PhyDbgInfo.NumQryPhyStatusOFDM++;
|
|
|
|
|
|
/* (1)Get RSSI for HT rate */
|
|
|
|
|
|
- for (i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++) {
|
|
|
+ for (i = RF_PATH_A; i < RF_PATH_MAX; i++) {
|
|
|
/* 2008/01/30 MH we will judge RF RX path now. */
|
|
|
if (dm_odm->RFPathRxEnable & BIT(i))
|
|
|
rf_rx_num++;
|
|
@@ -252,7 +252,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
|
|
|
EVM = odm_EVMdbToPercentage((pPhyStaRpt->stream_rxevm[i])); /* dbm */
|
|
|
|
|
|
if (pPktinfo->bPacketMatchBSSID) {
|
|
|
- if (i == ODM_RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */
|
|
|
+ if (i == RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */
|
|
|
pPhyInfo->SignalQuality = (u8)(EVM & 0xff);
|
|
|
pPhyInfo->RxMIMOSignalQuality[i] = (u8)(EVM & 0xff);
|
|
|
}
|
|
@@ -330,15 +330,15 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
|
|
|
|
|
|
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
|
|
|
if (!isCCKrate) { /* ofdm rate */
|
|
|
- if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0) {
|
|
|
- RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
|
|
+ if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_B] == 0) {
|
|
|
+ RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
|
|
|
} else {
|
|
|
- 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];
|
|
|
+ if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[RF_PATH_B]) {
|
|
|
+ RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
|
|
|
+ RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];
|
|
|
} else {
|
|
|
- RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
|
|
|
- RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
|
|
|
+ RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];
|
|
|
+ RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
|
|
|
}
|
|
|
if ((RSSI_max - RSSI_min) < 3)
|
|
|
RSSI_Ave = RSSI_max;
|
|
@@ -445,11 +445,11 @@ void ODM_MacStatusQuery(struct odm_dm_struct *dm_odm, u8 *mac_stat,
|
|
|
}
|
|
|
|
|
|
enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm,
|
|
|
- enum ODM_RF_RADIO_PATH content,
|
|
|
- enum ODM_RF_RADIO_PATH rfpath)
|
|
|
+ enum rf_radio_path content,
|
|
|
+ enum rf_radio_path rfpath)
|
|
|
{
|
|
|
ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===>ODM_ConfigRFWithHeaderFile\n"));
|
|
|
- if (rfpath == ODM_RF_PATH_A)
|
|
|
+ if (rfpath == RF_PATH_A)
|
|
|
READ_AND_CONFIG(8188E, _RadioA_1T_);
|
|
|
ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_A:Rtl8188ERadioA_1TArray\n"));
|
|
|
ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_B:Rtl8188ERadioB_1TArray\n"));
|