staging: r8188eu: remove more usages of rf_type
cover staging: r8188eu: remove more usages of rf_type
This series removes some more usages of rf_type to get one step closer to remove rf_type from the hal_data_8188e structure.
Tested with InterTech DMG-02 on x86_64.
Michael Straube (5):
staging: r8188eu: remove rf_type from rtw_update_ht_cap()
staging: r8188eu: remove rf_type from issue_assocreq()
staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset()
staging: r8188eu: remove rf_type from getTxPowerIndex88E()
staging: r8188eu: remove TxCount from getTxPowerIndex88E()
drivers/staging/r8188eu/core/rtw_mlme.c | 12 +-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 25 ++---- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 85 +++---------------- 3 files changed, 20 insertions(+), 102 deletions(-)
Signature · 1 line
2.33.1
PATCH 1/5 staging: r8188eu: remove rf_type from rtw_update_ht_cap()
rf_type is always RF_1T1R. Remove it from rtw_update_ht_cap() and remove related dead code.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +3 -9
@@ -1999,17 +1999,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {int i; -u8 rf_type; - -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));/* update the MCS rates */ -for (i =0 ; i <16 ; i++) { -if ((rf_type ==RF_1T1R ) || (rf_type ==RF_1T2R )) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } +for (i =0 ; i <16 ; i++) + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; +/* switch to the 40M Hz mode according to the AP */ pmlmeext->cur_bwmode =HT_CHANNEL_WIDTH_40 ;switch ((pmlmeinfo->HT_info.infos[0 ] &0x3 )) {
Signature · 1 line
2.33.1
PATCH 2/5 staging: r8188eu: remove rf_type from issue_assocreq()
In reply to Michael Strauberf_type is always RF_1T1R. Remove it from issue_assocreq() and remove related dead code.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 25 +++++---------------- 1 file changed, 5 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +5 -20
@@ -5060,7 +5060,7 @@ void issue_assocreq(struct adapter *padapter)__le16 *fctrl;__le16 le_tmp;unsigned int i, j, ie_len, index =0 ; -unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates]; +unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -5185,25 +5185,10 @@ void issue_assocreq(struct adapter *padapter)/* todo: disable SM power save mode */ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x000c ); -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -switch (rf_type) { -case RF_1T1R : -if (pregpriv->rx_stbc) - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ -memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R,16 ); -break ; -case RF_2T2R : -case RF_1T2R : -default : -if ((pregpriv->rx_stbc ==0x3 ) ||/* enable for 2.4/5 GHz */ - ((pmlmeext->cur_wireless_mode &WIRELESS_11_24N ) && (pregpriv->rx_stbc ==0x1 )) ||/* enable for 2.4GHz */ - (pregpriv->wifi_spec ==1 )) { -DBG_88E ("declare supporting RX STBC\n" ); - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0200 );/* RX STBC two spatial stream */ - } -memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R,16 ); -break ; - } +if (pregpriv->rx_stbc) + pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ +memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R,16 ); + pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&pmlmeinfo->HT_caps), &pattrib->pktlen); } }
Signature · 1 line
2.33.1
PATCH 3/5 staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset()
In reply to Michael StraubepHalData->rf_type is always RF_1T1R. Remove unnecessary checks and related dead code from storePwrIndexDiffRateOffset().
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +2 -6
@@ -506,8 +506,7 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4 ] = Data;if (RegAddr == rTxAGC_A_Mcs15_Mcs12) { pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5 ] = Data; -if (pHalData->rf_type ==RF_1T1R ) - pHalData->pwrGroupCnt++; + pHalData->pwrGroupCnt++; }if (RegAddr == rTxAGC_B_Rate18_06) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8 ] = Data;
@@ -523,11 +522,8 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11 ] = Data;if (RegAddr == rTxAGC_B_Mcs11_Mcs08) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12 ] = Data; -if (RegAddr == rTxAGC_B_Mcs15_Mcs12) { +if (RegAddr == rTxAGC_B_Mcs15_Mcs12) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13 ] = Data; -if (pHalData->rf_type !=RF_1T1R ) - pHalData->pwrGroupCnt++; - } }static int phy_BB8188E_Config_ParaFile (struct adapter *Adapter)
Signature · 1 line
2.33.1
PATCH 4/5 staging: r8188eu: remove rf_type from getTxPowerIndex88E()
In reply to Michael StraubepHalData->rf_type is always RF_1T1R. As a result the variable path_nums is always set to 1 and the for loop is entered only once with TxCount = 0. Also RF_PATH_A = 0. Remove the unneeded check for pHalData->rf_type and resulting dead code from getTxPowerIndex88E().
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 80 +++---------------- 1 file changed, 12 insertions(+), 68 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +12 -68
@@ -611,74 +611,18 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower {struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);u8 index = (channel -1 ); -u8 TxCount =0 , path_nums; - -if ((RF_1T2R == pHalData->rf_type) || (RF_1T1R == pHalData->rf_type)) - path_nums =1 ; -else - path_nums =2 ; - -for (TxCount =0 ; TxCount < path_nums; TxCount++) { -if (TxCount ==RF_PATH_A ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_B ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_C ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_D ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[RF_PATH_C ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; - -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[RF_PATH_C ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; - -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - } - } +u8 TxCount =RF_PATH_A ; + +/* 1. CCK */ + cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; +/* 2. OFDM */ + ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; +/* 1. BW20 */ + BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; +/* 2. BW40 */ + BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; } static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,
Signature · 1 line
2.33.1
PATCH 5/5 staging: r8188eu: remove TxCount from getTxPowerIndex88E()
In reply to Michael StraubeIn getTxPowerIndex88E() the variable TxCount is set to RF_PATH_A and never changed. Remove the unnecessary extra variable and replace its usage with RF_PATH_A.
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +6 -7
@@ -611,18 +611,17 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower {struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);u8 index = (channel -1 ); -u8 TxCount =RF_PATH_A ;/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; + cckPowerLevel[RF_PATH_A ] = pHalData->Index24G_CCK_Base[RF_PATH_A ][index];/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; + ofdmPowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->OFDM_24G_Diff[RF_PATH_A ][RF_PATH_A ];/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; + BW20PowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->BW20_24G_Diff[RF_PATH_A ][RF_PATH_A ];/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; + BW40PowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index]; } static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,
Signature · 1 line
2.33.1
Quoted 12 lines · Michael Straube
This series removes some more usages of
rf_typeto get one step closer to removerf_typefrom thehal_data_8188estructure.Tested with InterTech DMG-02 on
x86_64.Michael Straube (5):
staging: r8188eu: removerf_typefromrtw_update_ht_cap()
staging: r8188eu: removerf_typefromissue_assocreq()
staging: r8188eu: removerf_typefromstorePwrIndexDiffRateOffset()
staging: r8188eu: removerf_typefromgetTxPowerIndex88E()
staging: r8188eu: remove TxCount fromgetTxPowerIndex88E()
Quoted 5 lines
drivers/staging/r8188eu/core/rtw_mlme.c | 12 +-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 25 ++---- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 85 +++---------------- 3 files changed, 20 insertions(+), 102 deletions(-)
This series is outdated an can be dropped.
Thanks,
Michael