staging: r8188eu: more odm cleanups
cover staging: r8188eu: more odm cleanups
This series removes more unneeded and/or dead odm code.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (7):
staging: r8188eu: remove duplicate structure
staging: r8188eu: BTRxRSSIPercentage is set but never used
staging: r8188eu: rename ODM_PhyStatusQuery_92CSeries()
staging: r8188eu: remove unused cases from ODM_CmnInfo{Hook,Update}
staging: r8188eu: remove unused fields from enum odm_common_info_def
staging: r8188eu: remove unused enums and defines from odm.h
staging: r8188eu: RFType type is always ODM_1T1R
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 82 +--------- drivers/staging/r8188eu/hal/odm.c | 70 ++------- drivers/staging/r8188eu/hal/odm_HWConfig.c | 31 ++-- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 - drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/r8188eu/include/odm.h | 142 ------------------ .../staging/r8188eu/include/odm_HWConfig.h | 2 +- drivers/staging/r8188eu/include/rtw_recv.h | 1 - 8 files changed, 26 insertions(+), 311 deletions(-)
Signature · 1 line
2.33.1
PATCH 1/7 staging: r8188eu: remove duplicate structure
The structures odm_phy_status_info and phy_info are redundant. Keep phy_info and remove odm_phy_status_info.
--- drivers/staging/r8188eu/hal/odm_HWConfig.c | 12 ++++++------ drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/r8188eu/include/odm.h | 17 ----------------- drivers/staging/r8188eu/include/odm_HWConfig.h | 2 +- 4 files changed, 8 insertions(+), 25 deletions(-)
drivers/staging/r8188eu/hal/odm_HWConfig.c +6 -6
@@ -53,7 +53,7 @@ static u8 odm_evm_db_to_percentage(s8 value) }static void odm_RxPhyStatus92CSeries_Parsing (struct odm_dm_struct *dm_odm, -struct odm_phy_status_info *pPhyInfo, +struct phy_info *pPhyInfo,u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo,struct adapter *adapt)
@@ -137,7 +137,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, pPhyInfo->RxPWDBAll =PWDB_ALL ; pPhyInfo->BTRxRSSIPercentage =PWDB_ALL ; - pPhyInfo->RecvSignalPower = rx_pwr_all; + pPhyInfo->recvpower = rx_pwr_all;/* (3) Get Signal Quality (EVM) */ if (pPktinfo->bPacketMatchBSSID) {u8 SQ , SQ_rpt;
@@ -193,7 +193,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, pPhyInfo->RxPWDBAll =PWDB_ALL ; pPhyInfo->BTRxRSSIPercentage =PWDB_ALL_BT ; pPhyInfo->RxPower = rx_pwr_all; - pPhyInfo->RecvSignalPower = rx_pwr_all; + pPhyInfo->recvpower = rx_pwr_all;/* (3)EVM of HT rate */ if (pPktinfo->Rate >=DESC92C_RATEMCS8 && pPktinfo->Rate <=DESC92C_RATEMCS15 )
@@ -230,7 +230,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, }static void odm_Process_RSSIForDM (struct odm_dm_struct *dm_odm, -struct odm_phy_status_info *pPhyInfo, +struct phy_info *pPhyInfo,struct odm_per_pkt_info *pPktinfo) {s32 UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK;
@@ -366,7 +366,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,/* Endianness before calling this API */ static void ODM_PhyStatusQuery_92CSeries (struct odm_dm_struct *dm_odm, -struct odm_phy_status_info *pPhyInfo, +struct phy_info *pPhyInfo,u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo,struct adapter *adapt)
@@ -378,7 +378,7 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm, }void ODM_PhyStatusQuery (struct odm_dm_struct *dm_odm, -struct odm_phy_status_info *pPhyInfo, +struct phy_info *pPhyInfo,u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo,struct adapter *adapt) {
drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +1 -1
@@ -127,7 +127,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, struct phy_statstruct adapter *padapter = precvframe->adapter;struct rx_pkt_attrib *pattrib = &precvframe->attrib;struct hal_data_8188e *pHalData =GET_HAL_DATA (padapter); -struct odm_phy_status_info *pPHYInfo = (struct odm_phy_status_info *)(&pattrib->phy_info); +struct phy_info *pPHYInfo = &pattrib->phy_info;u8 *wlanhdr;struct odm_per_pkt_info pkt_info;u8 *sa =NULL ;
drivers/staging/r8188eu/include/odm.h +0 -17
@@ -168,23 +168,6 @@ struct odm_rate_adapt {#define DM_Type_ByDriver 1 -/* Declare for common info */ - -struct odm_phy_status_info { -u8 RxPWDBAll; -u8 SignalQuality;/* in 0-100 index. */ -u8 RxMIMOSignalQuality[MAX_PATH_NUM_92CS ];/* EVM */ -u8 RxMIMOSignalStrength[MAX_PATH_NUM_92CS ];/* in 0~100 index */ -s8 RxPower;/* in dBm Translate from PWdB */ -s8 RecvSignalPower;/* Real power in dBm for this packet, no -* beautification and aggregation. Keep this raw -* info to be used for the other procedures. */ -u8 BTRxRSSIPercentage; -u8 SignalStrength;/* in 0-100 index. */ -u8 RxPwr[MAX_PATH_NUM_92CS ];/* per-path's pwdb */ -u8 RxSNR[MAX_PATH_NUM_92CS ];/* per-path's SNR */ -}; -struct odm_phy_dbg_info {/* ODM Write,debug info */ s8 RxSNRdB[MAX_PATH_NUM_92CS ];
drivers/staging/r8188eu/include/odm_HWConfig.h +1 -1
@@ -90,7 +90,7 @@ struct phy_status_rpt { };void ODM_PhyStatusQuery (struct odm_dm_struct *pDM_Odm, -struct odm_phy_status_info *pPhyInfo, +struct phy_info *pPhyInfo,u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo,struct adapter *adapt);
Signature · 1 line
2.33.1
PATCH 2/7 staging: r8188eu: BTRxRSSIPercentage is set but never used
In reply to Michael StraubeBTRxRSSIPercentage is set but never used, remove it from structure phy_info.
--- drivers/staging/r8188eu/hal/odm_HWConfig.c | 5 +---- drivers/staging/r8188eu/include/rtw_recv.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/r8188eu/hal/odm_HWConfig.c +1 -4
@@ -60,7 +60,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, {u8 i, Max_spatial_stream;s8 rx_pwr[4 ], rx_pwr_all =0 ; -u8 EVM ,PWDB_ALL =0 ,PWDB_ALL_BT ; +u8 EVM ,PWDB_ALL =0 ;u8 RSSI , total_rssi =0 ;u8 isCCKrate =0 ;u8 rf_rx_num =0 ;
@@ -136,7 +136,6 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, } pPhyInfo->RxPWDBAll =PWDB_ALL ; - pPhyInfo->BTRxRSSIPercentage =PWDB_ALL ; pPhyInfo->recvpower = rx_pwr_all;/* (3) Get Signal Quality (EVM) */ if (pPktinfo->bPacketMatchBSSID) {
@@ -188,10 +187,8 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >>1 ) &0x7f ) -110 ;PWDB_ALL =odm_QueryRxPwrPercentage (rx_pwr_all); -PWDB_ALL_BT =PWDB_ALL ; pPhyInfo->RxPWDBAll =PWDB_ALL ; - pPhyInfo->BTRxRSSIPercentage =PWDB_ALL_BT ; pPhyInfo->RxPower = rx_pwr_all; pPhyInfo->recvpower = rx_pwr_all;
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -78,7 +78,6 @@ struct phy_info {/* Real power in dBm for this packet, no beautification and aggregation. * Keep this raw info to be used for the other procedures. */ s8 recvpower; -u8 BTRxRSSIPercentage;u8 SignalStrength;/* in 0-100 index. */ u8 RxPwr[MAX_PATH_NUM_92CS ];/* per-path's pwdb */ u8 RxSNR[MAX_PATH_NUM_92CS ];/* per-path's SNR */
Signature · 1 line
2.33.1
PATCH 3/7 staging: r8188eu: rename ODM_PhyStatusQuery_92CSeries()
In reply to Michael StraubeODM_PhyStatusQuery() is just a wrapper aroundODM_PhyStatusQuery_92CSeries().
Rename ODM_PhyStatusQuery_92CSeries to ODM_PhyStatusQuery() and remove the wrapper.
--- drivers/staging/r8188eu/hal/odm_HWConfig.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/staging/r8188eu/hal/odm_HWConfig.c +5 -13
@@ -362,11 +362,11 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm, }/* Endianness before calling this API */ -static void ODM_PhyStatusQuery_92CSeries (struct odm_dm_struct *dm_odm, -struct phy_info *pPhyInfo, -u8 *pPhyStatus, -struct odm_per_pkt_info *pPktinfo, -struct adapter *adapt) +void ODM_PhyStatusQuery (struct odm_dm_struct *dm_odm, +struct phy_info *pPhyInfo, +u8 *pPhyStatus, +struct odm_per_pkt_info *pPktinfo, +struct adapter *adapt) {odm_RxPhyStatus92CSeries_Parsing (dm_odm, pPhyInfo, pPhyStatus, pPktinfo, adapt);
@@ -374,14 +374,6 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm,odm_Process_RSSIForDM (dm_odm, pPhyInfo, pPktinfo); } -void ODM_PhyStatusQuery (struct odm_dm_struct *dm_odm, -struct phy_info *pPhyInfo, -u8 *pPhyStatus,struct odm_per_pkt_info *pPktinfo, -struct adapter *adapt) -{ -ODM_PhyStatusQuery_92CSeries (dm_odm, pPhyInfo, pPhyStatus, pPktinfo, adapt); -} -enum HAL_STATUS ODM_ConfigRFWithHeaderFile (struct odm_dm_struct *dm_odm,enum rf_radio_path content,enum rf_radio_path rfpath)
Signature · 1 line
2.33.1
PATCH 4/7 staging: r8188eu: remove unused cases from ODM_CmnInfo{Hook,Update}
In reply to Michael StraubeRemove unused cases from ODM_CmnInfo{Hook,Update}.
--- drivers/staging/r8188eu/hal/odm.c | 30 --------------------------- drivers/staging/r8188eu/include/odm.h | 10 --------- 2 files changed, 40 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -30
@@ -249,36 +249,12 @@ void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmncase ODM_CMNINFO_CHNL : pDM_Odm->pChannel = (u8 *)pValue;break ; -case ODM_CMNINFO_DMSP_GET_VALUE : - pDM_Odm->pbGetValueFromOtherMac = (bool *)pValue; -break ; -case ODM_CMNINFO_BUDDY_ADAPTOR : - pDM_Odm->pBuddyAdapter = (struct adapter **)pValue; -break ; -case ODM_CMNINFO_DMSP_IS_MASTER : - pDM_Odm->pbMasterOfDMSP = (bool *)pValue; -break ;case ODM_CMNINFO_SCAN : pDM_Odm->pbScanInProcess = (bool *)pValue;break ;case ODM_CMNINFO_POWER_SAVING : pDM_Odm->pbPowerSaving = (bool *)pValue;break ; -case ODM_CMNINFO_ONE_PATH_CCA : - pDM_Odm->pOnePathCCA = (u8 *)pValue; -break ; -case ODM_CMNINFO_DRV_STOP : - pDM_Odm->pbDriverStopped = (bool *)pValue; -break ; -case ODM_CMNINFO_PNP_IN : - pDM_Odm->pbDriverIsGoingToPnpSetPowerSleep = (bool *)pValue; -break ; -case ODM_CMNINFO_INIT_ON : - pDM_Odm->pinit_adpt_in_progress = (bool *)pValue; -break ; -case ODM_CMNINFO_ANT_TEST : - pDM_Odm->pAntennaTest = (u8 *)pValue; -break ;case ODM_CMNINFO_NET_CLOSED : pDM_Odm->pbNet_closed = (bool *)pValue;break ;
@@ -314,12 +290,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)case ODM_CMNINFO_RSSI_MIN : pDM_Odm->RSSI_Min = (u8 )Value;break ; -case ODM_CMNINFO_RA_THRESHOLD_HIGH : - pDM_Odm->RateAdaptive.HighRSSIThresh = (u8 )Value; -break ; -case ODM_CMNINFO_RA_THRESHOLD_LOW : - pDM_Odm->RateAdaptive.LowRSSIThresh = (u8 )Value; -break ; } }
drivers/staging/r8188eu/include/odm.h +0 -10
@@ -243,16 +243,8 @@ enum odm_common_info_def {ODM_CMNINFO_BW ,/* ODM_BW_E */ ODM_CMNINFO_CHNL , -ODM_CMNINFO_DMSP_GET_VALUE , -ODM_CMNINFO_BUDDY_ADAPTOR , -ODM_CMNINFO_DMSP_IS_MASTER ,ODM_CMNINFO_SCAN ,ODM_CMNINFO_POWER_SAVING , -ODM_CMNINFO_ONE_PATH_CCA ,/* ODM_CCA_PATH_E */ -ODM_CMNINFO_DRV_STOP , -ODM_CMNINFO_PNP_IN , -ODM_CMNINFO_INIT_ON , -ODM_CMNINFO_ANT_TEST ,ODM_CMNINFO_NET_CLOSED , ODM_CMNINFO_MP_MODE,/* POINTER REFERENCE----------- */
@@ -262,8 +254,6 @@ enum odm_common_info_def {ODM_CMNINFO_WIFI_DISPLAY ,ODM_CMNINFO_LINK ,ODM_CMNINFO_RSSI_MIN , -ODM_CMNINFO_RA_THRESHOLD_HIGH ,/* u8 */ -ODM_CMNINFO_RA_THRESHOLD_LOW ,/* u8 */ ODM_CMNINFO_RF_ANTENNA_TYPE ,/* u8 */ ODM_CMNINFO_BT_DISABLED , ODM_CMNINFO_BT_OPERATION,
Signature · 1 line
2.33.1
PATCH 5/7 staging: r8188eu: remove unused fields from enum odm_common_info_def
In reply to Michael StraubeRemove unused fields from enum odm_common_info_def.
--- drivers/staging/r8188eu/include/odm.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/r8188eu/include/odm.h +0 -6
@@ -246,7 +246,6 @@ enum odm_common_info_def {ODM_CMNINFO_SCAN ,ODM_CMNINFO_POWER_SAVING , ODM_CMNINFO_NET_CLOSED, - ODM_CMNINFO_MP_MODE,/* POINTER REFERENCE----------- */ /* CALL BY VALUE------------- */
@@ -255,11 +254,6 @@ enum odm_common_info_def {ODM_CMNINFO_LINK ,ODM_CMNINFO_RSSI_MIN , ODM_CMNINFO_RF_ANTENNA_TYPE, /* u8 */ -ODM_CMNINFO_BT_DISABLED , -ODM_CMNINFO_BT_OPERATION , -ODM_CMNINFO_BT_DIG , -ODM_CMNINFO_BT_BUSY ,/* Check Bt is using or not */ - ODM_CMNINFO_BT_DISABLE_EDCA, /* CALL BY VALUE-------------*/ };
Signature · 1 line
2.33.1
PATCH 6/7 staging: r8188eu: remove unused enums and defines from odm.h
In reply to Michael StraubeRemove unused enums and defines from odm.h.
--- drivers/staging/r8188eu/include/odm.h | 95 --------------------------- 1 file changed, 95 deletions(-)
drivers/staging/r8188eu/include/odm.h +0 -95
@@ -159,7 +159,6 @@ struct odm_rate_adapt {#define IQK_MAC_REG_NUM 4#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM_MAX 10#define IQK_BB_REG_NUM 9#define HP_THERMAL_NUM 8
@@ -287,19 +286,6 @@ enum odm_ability_def {# define ODM_ITRF_USB 0x2 -/* ODM_CMNINFO_RF_TYPE */ -/* For example 1T2R (A+AB = BIT(0)|BIT(4)|BIT(5)) */ -enum odm_rf_path { -ODM_RF_TX_A =BIT (0 ), -ODM_RF_TX_B =BIT (1 ), -ODM_RF_TX_C =BIT (2 ), -ODM_RF_TX_D =BIT (3 ), -ODM_RF_RX_A =BIT (4 ), -ODM_RF_RX_B =BIT (5 ), -ODM_RF_RX_C =BIT (6 ), -ODM_RF_RX_D =BIT (7 ), -}; -enum odm_rf_type {ODM_1T1R =0 ,ODM_1T2R =1 ,
@@ -311,14 +297,6 @@ enum odm_rf_type { ODM_4T4R = 7, }; -/* ODM Dynamic common info value definition */ - -enum odm_mac_phy_mode { -ODM_SMSP =0 , -ODM_DMSP =1 , -ODM_DMDP =2 , -}; -/* ODM_CMNINFO_OP_MODE */ enum odm_operation_mode {ODM_NO_LINK =BIT (0 ),
@@ -341,38 +319,12 @@ enum odm_wireless_mode { ODM_WM_AUTO = BIT(5), }; -/* ODM_CMNINFO_SEC_CHNL_OFFSET */ -enum odm_sec_chnl_offset { -ODM_DONT_CARE =0 , -ODM_BELOW =1 , -ODM_ABOVE =2 -}; - -/* ODM_CMNINFO_SEC_MODE */ -enum odm_security { -ODM_SEC_OPEN =0 , -ODM_SEC_WEP40 =1 , -ODM_SEC_TKIP =2 , -ODM_SEC_RESERVE =3 , -ODM_SEC_AESCCMP =4 , -ODM_SEC_WEP104 =5 , -ODM_WEP_WPA_MIXED =6 ,/* WEP + WPA */ -ODM_SEC_SMS4 =7 , -}; -/* ODM_CMNINFO_BW */ enum odm_bw {ODM_BW20M =0 ,ODM_BW40M =1 , }; -/* ODM_CMNINFO_ONE_PATH_CCA */ -enum odm_cca_path { -ODM_CCA_2R =0 , -ODM_CCA_1R_A =1 , -ODM_CCA_1R_B =2 , -}; -struct odm_ra_info {u8 RateID;u32 RateMask;
@@ -673,13 +625,6 @@ struct odm_dm_struct {struct timer_list FastAntTrainingTimer; };/* DM_Dynamic_Mechanism_Structure */ -enum ODM_RF_CONTENT { - odm_radioa_txt =0x1000 , - odm_radiob_txt =0x1001 , - odm_radioc_txt =0x1002 , - odm_radiod_txt =0x1003 -}; -enum odm_bb_config_type {CONFIG_BB_PHY_REG ,CONFIG_BB_AGC_TAB ,
@@ -687,38 +632,9 @@ enum odm_bb_config_type { CONFIG_BB_PHY_REG_PG, }; -/* Status code */ -enum rt_status { -RT_STATUS_SUCCESS , -RT_STATUS_FAILURE , -RT_STATUS_PENDING , -RT_STATUS_RESOURCE , -RT_STATUS_INVALID_CONTEXT , -RT_STATUS_INVALID_PARAMETER , -RT_STATUS_NOT_SUPPORT , -RT_STATUS_OS_API_FAILED , -}; - -/* 3=========================================================== */ -/* 3 DIG */ -/* 3=========================================================== */ - -enum dm_dig_op { -RT_TYPE_THRESH_HIGH =0 , -RT_TYPE_THRESH_LOW =1 , -RT_TYPE_BACKOFF =2 , -RT_TYPE_RX_GAIN_MIN =3 , -RT_TYPE_RX_GAIN_MAX =4 , -RT_TYPE_ENABLE =5 , -RT_TYPE_DISABLE =6 , -DIG_OP_TYPE_MAX -}; -#define DM_DIG_THRESH_HIGH 40#define DM_DIG_THRESH_LOW 35 -#define DM_SCAN_RSSI_TH 0x14/* scan return issue for LC */ -#define DM_false_ALARM_THRESH_LOW 400#define DM_false_ALARM_THRESH_HIGH 1000
@@ -726,23 +642,12 @@ enum dm_dig_op {#define DM_DIG_MIN_NIC 0x1e/* 0x22/0x1c */ #define DM_DIG_MAX_AP 0x32 -#define DM_DIG_MIN_AP 0x20 - -#define DM_DIG_MAX_NIC_HP 0x46 -#define DM_DIG_MIN_NIC_HP 0x2e - -#define DM_DIG_MAX_AP_HP 0x42 -#define DM_DIG_MIN_AP_HP 0x30/* vivi 92c&92d has different definition, 20110504 */ /* this is for 92c */ #define DM_DIG_FA_TH0 0x200/* 0x20 */ #define DM_DIG_FA_TH1 0x300/* 0x100 */ #define DM_DIG_FA_TH2 0x400/* 0x200 */ -/* this is for 92d */ -#define DM_DIG_FA_TH0_92D 0x100 -#define DM_DIG_FA_TH1_92D 0x400 -#define DM_DIG_FA_TH2_92D 0x600#define DM_DIG_BACKOFF_MAX 12#define DM_DIG_BACKOFF_MIN -4
Signature · 1 line
2.33.1
PATCH 7/7 staging: r8188eu: RFType type is always ODM_1T1R
In reply to Michael StraubeThis driver is for 1T1R chips. The field RfType of odm_dm_struct is set to ODM_1T1R and never changed. Remove code that initializes RFType, remove it from odm_dm_struct and remove resulting dead code.
--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 82 ++------------------ drivers/staging/r8188eu/hal/odm.c | 40 +++------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 -- drivers/staging/r8188eu/include/odm.h | 14 ---- 4 files changed, 14 insertions(+), 129 deletions(-)
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +5 -77
@@ -583,50 +583,6 @@ static void patha_fill_iqk(struct adapter *adapt, bool iqkok, s32 result[][8], u } } -static void pathb_fill_iqk (struct adapter *adapt,bool iqkok,s32 result[][8 ],u8 final_candidate,bool txonly) -{ -u32 Oldval_1,X ,TX1_A , reg; -s32 Y ,TX1_C ; -struct hal_data_8188e *pHalData =GET_HAL_DATA (adapt); -struct odm_dm_struct *dm_odm = &pHalData->odmpriv; - -if (final_candidate ==0xFF ) { -return ; - }else if (iqkok) { - Oldval_1 = (ODM_GetBBReg (dm_odm, rOFDM0_XBTxIQImbalance, bMaskDWord) >>22 ) &0x3FF ; - -X = result[final_candidate][4 ]; -if ((X &0x00000200 ) !=0 ) -X =X |0xFFFFFC00 ; -TX1_A = (X * Oldval_1) >>8 ; -ODM_SetBBReg (dm_odm, rOFDM0_XBTxIQImbalance,0x3FF ,TX1_A ); - -ODM_SetBBReg (dm_odm, rOFDM0_ECCAThreshold,BIT (27 ), ((X * Oldval_1 >>7 ) &0x1 )); - -Y = result[final_candidate][5 ]; -if ((Y &0x00000200 ) !=0 ) -Y =Y |0xFFFFFC00 ; - -TX1_C = (Y * Oldval_1) >>8 ; -ODM_SetBBReg (dm_odm, rOFDM0_XDTxAFE,0xF0000000 , ((TX1_C &0x3C0 ) >>6 )); -ODM_SetBBReg (dm_odm, rOFDM0_XBTxIQImbalance,0x003F0000 , (TX1_C &0x3F )); - -ODM_SetBBReg (dm_odm, rOFDM0_ECCAThreshold,BIT (25 ), ((Y * Oldval_1 >>7 ) &0x1 )); - -if (txonly) -return ; - - reg = result[final_candidate][6 ]; -ODM_SetBBReg (dm_odm, rOFDM0_XBRxIQImbalance,0x3FF , reg); - - reg = result[final_candidate][7 ] &0x3F ; -ODM_SetBBReg (dm_odm, rOFDM0_XBRxIQImbalance,0xFC00 , reg); - - reg = (result[final_candidate][7 ] >>6 ) &0xF ; -ODM_SetBBReg (dm_odm, rOFDM0_AGCRSSITable,0x0000F000 , reg); - } -} -void _PHY_SaveADDARegisters (struct adapter *adapt,u32 *ADDAReg,u32 *ADDABackup,u32 RegisterNum) {u32 i;
@@ -759,23 +715,11 @@ static bool phy_SimularityCompare_8188E( ) {u32 i, j, diff, sim_bitmap, bound =0 ; -struct hal_data_8188e *pHalData =GET_HAL_DATA (adapt); -struct odm_dm_struct *dm_odm = &pHalData->odmpriv;u8 final_candidate[2 ] = {0xFF ,0xFF };/* for path A and path B */ bool result = true; -bool is2t;s32 tmp1 =0 , tmp2 =0 ; -if ((dm_odm->RFType ==ODM_2T2R ) || (dm_odm->RFType ==ODM_2T3R ) || (dm_odm->RFType ==ODM_2T4R )) - is2t = true; -else - is2t = false; - -if (is2t) - bound =8 ; -else - bound =4 ; - + bound =4 ; sim_bitmap =0 ;for (i =0 ; i < bound; i++) {
@@ -1049,8 +993,8 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)struct odm_dm_struct *dm_odm = &pHalData->odmpriv;s32 result[4 ][8 ];/* last is final result */ u8 i, final_candidate; -bool pathaok, pathbok; -s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC, RegEC4; +bool pathaok; +s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC;bool is12simular, is13simular, is23simular;bool singletone = false, carrier_sup = false;u32 IQK_BB_REG_92C [IQK_BB_REG_NUM ] = {
@@ -1059,9 +1003,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance, rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta}; -bool is2t; - - is2t = (dm_odm->RFType ==ODM_2T2R ) ? true : false;if (!(dm_odm->SupportAbility &ODM_RF_CALIBRATION ))return ;
@@ -1086,13 +1027,12 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) } final_candidate =0xff ; pathaok = false; - pathbok = false; is12simular = false; is23simular = false; is13simular = false;for (i =0 ; i <3 ; i++) { -phy_IQCalibrate_8188E (adapt, result, i, is2t); +phy_IQCalibrate_8188E (adapt, result, i, false);if (i ==1 ) { is12simular =phy_SimularityCompare_8188E (adapt, result,0 ,1 );
@@ -1124,7 +1064,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) RegEA4 = result[i][2 ]; RegEB4 = result[i][4 ]; RegEBC = result[i][5 ]; - RegEC4 = result[i][6 ]; }if (final_candidate !=0xff ) {
@@ -1137,9 +1076,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) dm_odm->RFCalibrateInfo.RegE9C = RegE9C; dm_odm->RFCalibrateInfo.RegEB4 = RegEB4; dm_odm->RFCalibrateInfo.RegEBC = RegEBC; - RegEC4 = result[final_candidate][6 ]; pathaok = true; - pathbok = true; }else { dm_odm->RFCalibrateInfo.RegE94 =0x100 ; dm_odm->RFCalibrateInfo.RegEB4 =0x100 ;/* X default value */
@@ -1148,10 +1085,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) }if (RegE94 !=0 )patha_fill_iqk (adapt, pathaok, result, final_candidate, (RegEA4 ==0 )); -if (is2t) { -if (RegEB4 !=0 ) -pathb_fill_iqk (adapt, pathbok, result, final_candidate, (RegEC4 ==0 )); - }/* To Fix BSOD when final_candidate is 0xff */ /* by sherry 20120321 */
@@ -1182,10 +1115,5 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) timecount +=50 ; } -if (dm_odm->RFType ==ODM_2T2R ) { -phy_LCCalibrate_8188E (adapt, true); - }else { -/* For 88C 1T1R */ -phy_LCCalibrate_8188E (adapt, false); - } +phy_LCCalibrate_8188E (adapt, false); }
drivers/staging/r8188eu/hal/odm.c +9 -31
@@ -202,9 +202,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmncase ODM_CMNINFO_MP_TEST_CHIP : pDM_Odm->bIsMPChip = (u8 )Value;break ; -case ODM_CMNINFO_RF_TYPE : - pDM_Odm->RFType = (u8 )Value; -break ;case ODM_CMNINFO_RF_ANTENNA_TYPE : pDM_Odm->AntDivType = (u8 )Value;break ;
@@ -275,9 +272,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value)case ODM_CMNINFO_ABILITY : pDM_Odm->SupportAbility = (u32 )Value;break ; -case ODM_CMNINFO_RF_TYPE : - pDM_Odm->RFType = (u8 )Value; -break ;case ODM_CMNINFO_WIFI_DIRECT : pDM_Odm->bWIFI_Direct = (bool )Value;break ;
@@ -714,36 +708,20 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u rate_bitmap =0x00000ff5 ;break ;case (ODM_WM_B |ODM_WM_G |ODM_WM_N24G ): -if (pDM_Odm->RFType ==ODM_1T2R || pDM_Odm->RFType ==ODM_1T1R ) { -if (rssi_level ==DM_RATR_STA_HIGH ) { - rate_bitmap =0x000f0000 ; - }else if (rssi_level ==DM_RATR_STA_MIDDLE ) { - rate_bitmap =0x000ff000 ; - }else { -if (*pDM_Odm->pBandWidth ==ODM_BW40M ) - rate_bitmap =0x000ff015 ; -else - rate_bitmap =0x000ff005 ; - } +if (rssi_level ==DM_RATR_STA_HIGH ) { + rate_bitmap =0x000f0000 ; + }else if (rssi_level ==DM_RATR_STA_MIDDLE ) { + rate_bitmap =0x000ff000 ; }else { -if (rssi_level ==DM_RATR_STA_HIGH ) { - rate_bitmap =0x0f8f0000 ; - }else if (rssi_level ==DM_RATR_STA_MIDDLE ) { - rate_bitmap =0x0f8ff000 ; - }else { -if (*pDM_Odm->pBandWidth ==ODM_BW40M ) - rate_bitmap =0x0f8ff015 ; -else - rate_bitmap =0x0f8ff005 ; - } +if (*pDM_Odm->pBandWidth ==ODM_BW40M ) + rate_bitmap =0x000ff015 ; +else + rate_bitmap =0x000ff005 ; }break ;default :/* case WIRELESS_11_24N: */ -if (pDM_Odm->RFType ==RF_1T2R ) - rate_bitmap =0x000fffff ; -else - rate_bitmap =0x0fffffff ; + rate_bitmap =0x0fffffff ;break ; }
drivers/staging/r8188eu/hal/rtl8188e_dm.c +0 -7
@@ -35,13 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID)); -if (hal_data->rf_type ==RF_1T1R ) -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_RF_TYPE ,ODM_1T1R ); -else if (hal_data->rf_type ==RF_2T2R ) -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_RF_TYPE ,ODM_2T2R ); -else if (hal_data->rf_type ==RF_1T2R ) -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_RF_TYPE ,ODM_1T2R ); -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); pdmpriv->InitODMFlag = ODM_RF_CALIBRATION |
drivers/staging/r8188eu/include/odm.h +0 -14
@@ -229,7 +229,6 @@ enum odm_common_info_def {/* HOOK BEFORE REG INIT----------- */ ODM_CMNINFO_ABILITY ,/* ODM_ABILITY_E */ ODM_CMNINFO_MP_TEST_CHIP, - ODM_CMNINFO_RF_TYPE, /* RF_PATH_E or ODM_RF_TYPE_E? *//* HOOK BEFORE REG INIT----------- */ /* Dynamic value: */
@@ -286,17 +285,6 @@ enum odm_ability_def {# define ODM_ITRF_USB 0x2 -enum odm_rf_type { -ODM_1T1R =0 , -ODM_1T2R =1 , -ODM_2T2R =2 , -ODM_2T3R =3 , -ODM_2T4R =4 , -ODM_3T3R =5 , -ODM_3T4R =6 , -ODM_4T4R =7 , -}; -/* ODM_CMNINFO_OP_MODE */ enum odm_operation_mode {ODM_NO_LINK =BIT (0 ),
@@ -493,8 +481,6 @@ struct odm_dm_struct {/* HOOK BEFORE REG INIT----------- */ /* ODM Support Ability DIG/RATR/TX_PWR_TRACK/ �K�K = 1/2/3/�K */ u32 SupportAbility; -/* RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */ -u8 RFType;u32 BK_SupportAbility;u8 AntDivType;
Signature · 1 line
2.33.1
Thus wrote Michael Straube ([email protected]):
Quoted 13 lines
This series removes more unneeded and/or dead odm code.
Tested on
x86_64with Inter-Tech DMG-02.Michael Straube (7):
staging: r8188eu: remove duplicate structure
staging: r8188eu: BTRxRSSIPercentage is set but never used
staging: r8188eu: renameODM_PhyStatusQuery_92CSeries()
staging: r8188eu: remove unused cases from ODM_CmnInfo{Hook,Update}
staging: r8188eu: remove unused fields from enumodm_common_info_def
staging: r8188eu: remove unused enums and defines fromodm.h
staging: r8188eu: RFType type is alwaysODM_1T1R
Quoted 12 lines
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 82 +--------- drivers/staging/r8188eu/hal/odm.c | 70 ++------- drivers/staging/r8188eu/hal/odm_HWConfig.c | 31 ++-- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 - drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/r8188eu/include/odm.h | 142 ------------------ .../staging/r8188eu/include/odm_HWConfig.h | 2 +- drivers/staging/r8188eu/include/rtw_recv.h | 1 - 8 files changed, 26 insertions(+), 311 deletions(-)Signature · 1 line
2.33.1
Hi Michael,
Looks good, thanks. For all patches: