staging: r8188eu: remove odm_RegDefine11AC.h
cover staging: r8188eu: remove odm_RegDefine11AC.h
This set removes macros and code that is valid only for 11ac chips and therefore not needed/used in this driver. In the last patch we can finally remove the odm_RegDefine11AC.h header.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (12):
staging: r8188eu: remove comments from odm_interface.h
staging: r8188eu: remove unused macros from odm_interface.h
staging: r8188eu: remove _ic_type from macro _cat in odm_interface.h
staging: r8188eu: remove dead code from ODM_Write_DIG()
staging: r8188eu: remove unnecessary if statement
staging: r8188eu: remove more dead code from ODM_Write_DIG()
staging: r8188eu: remove macro ODM_REG
staging: r8188eu: remove macro ODM_BIT
staging: r8188eu: remove unnecessary if statements
staging: r8188eu: remove dead code from odm.c
staging: r8188eu: remove ODM_IC_11N_SERIES, ODM_IC_11AC_SERIES macros.
staging: r8188eu: remove header file odm_RegDefine11AC.h
drivers/staging/r8188eu/hal/odm.c | 224 +++++++----------- drivers/staging/r8188eu/include/odm.h | 5 - .../r8188eu/include/odm_RegDefine11AC.h | 29 --- .../staging/r8188eu/include/odm_interface.h | 41 ---- drivers/staging/r8188eu/include/odm_precomp.h | 1 - 5 files changed, 82 insertions(+), 218 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11AC.h
Signature · 1 line
2.33.0
PATCH 1/12 staging: r8188eu: remove comments from odm_interface.h
In order to make further cleanup easier to review remove some unnecessary comments from odm_interface.h
--- .../staging/r8188eu/include/odm_interface.h | 22 ------------------- 1 file changed, 22 deletions(-)
drivers/staging/r8188eu/include/odm_interface.h +0 -22
@@ -4,29 +4,11 @@#ifndef __ODM_INTERFACE_H__#define __ODM_INTERFACE_H__ -/* */ -/* =========== Constant/Structure/Enum/... Define */ -/* */ - -/* */ -/* =========== Macro Define */ -/* */ -#define _reg_all (_name) ODM_##_name#define _reg_ic (_name, _ic) ODM_##_name##_ic#define _bit_all (_name) BIT_##_name#define _bit_ic (_name, _ic) BIT_##_name##_ic -/* _cat: implemented by Token-Pasting Operator. */ - -/*=================================== - -#define ODM_REG_DIG_11N 0xC50 -#define ODM_REG_DIG_11AC 0xDDD - -ODM_REG(DIG,_pDM_Odm) -=====================================*/ -#define _reg_11N (_name) ODM_REG_##_name##_11N#define _reg_11AC (_name) ODM_REG_##_name##_11AC#define _bit_11N (_name) ODM_BIT_##_name##_11N
@@ -38,10 +20,6 @@ ODM_REG(DIG,_pDM_Odm) _func##_11AC(_name) \ ) -/* _name: name of register or bit. */ -/* Example: "ODM_REG(R_A_AGC_CORE1, pDM_Odm)" */ -/* gets "ODM_R_A_AGC_CORE1" or "ODM_R_A_AGC_CORE1_8192C", -* depends on SupportICType. */ #define ODM_REG (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _reg)#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _bit)
Signature · 1 line
2.33.0
PATCH 2/12 staging: r8188eu: remove unused macros from odm_interface.h
In reply to Michael StraubeRemove unused macros from odm_interface.h.
--- drivers/staging/r8188eu/include/odm_interface.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/r8188eu/include/odm_interface.h +0 -5
@@ -4,11 +4,6 @@#ifndef __ODM_INTERFACE_H__#define __ODM_INTERFACE_H__ -#define _reg_all (_name) ODM_##_name -#define _reg_ic (_name, _ic) ODM_##_name##_ic -#define _bit_all (_name) BIT_##_name -#define _bit_ic (_name, _ic) BIT_##_name##_ic -#define _reg_11N (_name) ODM_REG_##_name##_11N#define _reg_11AC (_name) ODM_REG_##_name##_11AC#define _bit_11N (_name) ODM_BIT_##_name##_11N
Signature · 1 line
2.33.0
PATCH 3/12 staging: r8188eu: remove _ic_type from macro _cat in odm_interface.h
In reply to Michael Straube((_ic_type) & ODM_IC_11N_SERIES) is always true since SupportICType is ODM_RTL8188E in this driver. Remove it from the _cat macro.
--- drivers/staging/r8188eu/include/odm_interface.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/include/odm_interface.h +3 -9
@@ -5,18 +5,12 @@#define __ODM_INTERFACE_H__#define _reg_11N (_name) ODM_REG_##_name##_11N -#define _reg_11AC (_name) ODM_REG_##_name##_11AC#define _bit_11N (_name) ODM_BIT_##_name##_11N -#define _bit_11AC (_name) ODM_BIT_##_name##_11AC -#define _cat (_name, _ic_type, _func) \ - ( \ - ((_ic_type) & ODM_IC_11N_SERIES) ? _func##_11N(_name) : \ - _func##_11AC(_name) \ - ) +#define _cat (_name, _func) (_func##_11N(_name)) -#define ODM_REG (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _reg) -#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _bit) +#define ODM_REG (_name, _pDM_Odm) _cat(_name, _reg) +#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _bit)enum odm_h2c_cmd {ODM_H2C_RSSI_REPORT =0 ,
Signature · 1 line
2.33.0
PATCH 4/12 staging: r8188eu: remove dead code from ODM_Write_DIG()
In reply to Michael StraubeIn this driver SupportPlatform is ODM_CE, so code in the "else if (pDM_Odm->SupportPlatform & (ODM_AP | ODM_ADSL))" is never executed. Remove it.
--- drivers/staging/r8188eu/hal/odm.c | 34 ------------------------------- 1 file changed, 34 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -34
@@ -460,21 +460,6 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) pDM_Odm->bOneEntryOnly = false; } -static int getIGIForDiff (int value_IGI) -{ -#define ONERCCA_LOW_TH 0x30 -#define ONERCCA_LOW_DIFF 8 - -if (value_IGI <ONERCCA_LOW_TH ) { -if ((ONERCCA_LOW_TH - value_IGI) <ONERCCA_LOW_DIFF ) -return ONERCCA_LOW_TH ; -else -return value_IGI +ONERCCA_LOW_DIFF ; - }else { -return value_IGI; - } -} -void ODM_Write_DIG (struct odm_dm_struct *pDM_Odm,u8 CurrentIGI) {struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
@@ -484,26 +469,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI);if (pDM_Odm->SupportICType !=ODM_RTL8188E )ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); - }else if (pDM_Odm->SupportPlatform & (ODM_AP |ODM_ADSL )) { -switch (*pDM_Odm->pOnePathCCA) { -case ODM_CCA_2R : -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -if (pDM_Odm->SupportICType !=ODM_RTL8188E ) -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -break ; -case ODM_CCA_1R_A : -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -if (pDM_Odm->SupportICType !=ODM_RTL8188E ) -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm),getIGIForDiff (CurrentIGI)); -break ; -case ODM_CCA_1R_B : -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm),getIGIForDiff (CurrentIGI)); -if (pDM_Odm->SupportICType !=ODM_RTL8188E ) -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -break ; - } } -/* pDM_DigTable->PreIGValue = pDM_DigTable->CurIGValue; */ pDM_DigTable->CurIGValue = CurrentIGI; }/* Add by Neil Chen to enable edcca to MP Platform */
Signature · 1 line
2.33.0
PATCH 5/12 staging: r8188eu: remove unnecessary if statement
In reply to Michael StraubeSupportPlatform is ODM_CE in this driver. Remove an unnecessary if statement that checks the SupportPlatform value.
--- drivers/staging/r8188eu/hal/odm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/staging/r8188eu/hal/odm.c +4 -5
@@ -465,11 +465,10 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;if (pDM_DigTable->CurIGValue != CurrentIGI) { -if (pDM_Odm->SupportPlatform & (ODM_CE |ODM_MP )) { -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -if (pDM_Odm->SupportICType !=ODM_RTL8188E ) -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); - } +ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); +if (pDM_Odm->SupportICType !=ODM_RTL8188E ) +ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); + pDM_DigTable->CurIGValue = CurrentIGI; }/* Add by Neil Chen to enable edcca to MP Platform */
Signature · 1 line
2.33.0
PATCH 6/12 staging: r8188eu: remove more dead code from ODM_Write_DIG()
In reply to Michael StraubeSupportICType is ODM_RTL8188E in this driver. Remove code that is never executed.
--- drivers/staging/r8188eu/hal/odm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -4
@@ -466,12 +466,8 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)if (pDM_DigTable->CurIGValue != CurrentIGI) {ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); -if (pDM_Odm->SupportICType !=ODM_RTL8188E ) -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_B , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); - pDM_DigTable->CurIGValue = CurrentIGI; } -/* Add by Neil Chen to enable edcca to MP Platform */ }/* Need LPS mode for CE platform --2012--08--24--- */
Signature · 1 line
2.33.0
PATCH 7/12 staging: r8188eu: remove macro ODM_REG
In reply to Michael StraubeReplace and remove the macro ODM_REG to make the code cleaner.
--- drivers/staging/r8188eu/hal/odm.c | 6 +++--- drivers/staging/r8188eu/include/odm_interface.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/r8188eu/hal/odm.c +3 -3
@@ -465,7 +465,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;if (pDM_DigTable->CurIGValue != CurrentIGI) { -ODM_SetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm), CurrentIGI); +ODM_SetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT (IGI , pDM_Odm), CurrentIGI); pDM_DigTable->CurIGValue = CurrentIGI; } }
@@ -521,7 +521,7 @@ void odm_DIGInit(struct odm_dm_struct *pDM_Odm) {struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable; - pDM_DigTable->CurIGValue = (u8 )ODM_GetBBReg (pDM_Odm,ODM_REG (IGI_A , pDM_Odm),ODM_BIT (IGI , pDM_Odm)); + pDM_DigTable->CurIGValue = (u8 )ODM_GetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT (IGI , pDM_Odm)); pDM_DigTable->RssiLowThresh =DM_DIG_THRESH_LOW ; pDM_DigTable->RssiHighThresh =DM_DIG_THRESH_HIGH ; pDM_DigTable->FALowThresh = DM_false_ALARM_THRESH_LOW;
@@ -865,7 +865,7 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres)struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)/* modify by Guo.Mingzhi 2012-01-03 */ -ODM_Write1Byte (pDM_Odm,ODM_REG (CCK_CCA , pDM_Odm), CurCCK_CCAThres); +ODM_Write1Byte (pDM_Odm,ODM_REG_CCK_CCA_11N , CurCCK_CCAThres); pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres; pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres; }
drivers/staging/r8188eu/include/odm_interface.h +0 -2
@@ -4,12 +4,10 @@#ifndef __ODM_INTERFACE_H__#define __ODM_INTERFACE_H__ -#define _reg_11N (_name) ODM_REG_##_name##_11N#define _bit_11N (_name) ODM_BIT_##_name##_11N#define _cat (_name, _func) (_func##_11N(_name)) -#define ODM_REG (_name, _pDM_Odm) _cat(_name, _reg)#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _bit) enum odm_h2c_cmd {
Signature · 1 line
2.33.0
PATCH 8/12 staging: r8188eu: remove macro ODM_BIT
In reply to Michael StraubeReplace and remove the macro ODM_BIT to make the code cleaner.
--- drivers/staging/r8188eu/hal/odm.c | 4 ++-- drivers/staging/r8188eu/include/odm_interface.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/r8188eu/hal/odm.c +2 -2
@@ -465,7 +465,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;if (pDM_DigTable->CurIGValue != CurrentIGI) { -ODM_SetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT (IGI , pDM_Odm), CurrentIGI); +ODM_SetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT_IGI_11N , CurrentIGI); pDM_DigTable->CurIGValue = CurrentIGI; } }
@@ -521,7 +521,7 @@ void odm_DIGInit(struct odm_dm_struct *pDM_Odm) {struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable; - pDM_DigTable->CurIGValue = (u8 )ODM_GetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT (IGI , pDM_Odm)); + pDM_DigTable->CurIGValue = (u8 )ODM_GetBBReg (pDM_Odm,ODM_REG_IGI_A_11N ,ODM_BIT_IGI_11N ); pDM_DigTable->RssiLowThresh =DM_DIG_THRESH_LOW ; pDM_DigTable->RssiHighThresh =DM_DIG_THRESH_HIGH ; pDM_DigTable->FALowThresh = DM_false_ALARM_THRESH_LOW;
drivers/staging/r8188eu/include/odm_interface.h +0 -6
@@ -4,12 +4,6 @@#ifndef __ODM_INTERFACE_H__#define __ODM_INTERFACE_H__ -#define _bit_11N (_name) ODM_BIT_##_name##_11N - -#define _cat (_name, _func) (_func##_11N(_name)) - -#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _bit) -enum odm_h2c_cmd {ODM_H2C_RSSI_REPORT =0 , ODM_H2C_PSD_RESULT= 1,
Signature · 1 line
2.33.0
PATCH 9/12 staging: r8188eu: remove unnecessary if statements
In reply to Michael Straube(pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) is always false and (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) is always true since SupportICType is ODM_RTL8188E in this driver. Remove unnecessary if statements that check for this.
--- drivers/staging/r8188eu/hal/odm.c | 39 +++++++++++++------------------ 1 file changed, 16 insertions(+), 23 deletions(-)
drivers/staging/r8188eu/hal/odm.c +16 -23
@@ -163,22 +163,18 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)odm_DIGInit (pDM_Odm);odm_RateAdaptiveMaskInit (pDM_Odm); -if (pDM_Odm->SupportICType &ODM_IC_11AC_SERIES ) { - ; - }else if (pDM_Odm->SupportICType &ODM_IC_11N_SERIES ) { -odm_PrimaryCCA_Init (pDM_Odm);/* Gary */ -odm_DynamicBBPowerSavingInit (pDM_Odm); -odm_DynamicTxPowerInit (pDM_Odm); -odm_TXPowerTrackingInit (pDM_Odm); -ODM_EdcaTurboInit (pDM_Odm); -ODM_RAInfo_Init_all (pDM_Odm); -if ((pDM_Odm->AntDivType ==CG_TRX_HW_ANTDIV ) || - (pDM_Odm->AntDivType ==CGCS_RX_HW_ANTDIV ) || - (pDM_Odm->AntDivType ==CG_TRX_SMART_ANTDIV )) -odm_InitHybridAntDiv (pDM_Odm); -else if (pDM_Odm->AntDivType ==CGCS_RX_SW_ANTDIV ) -odm_SwAntDivInit (pDM_Odm); - } +odm_PrimaryCCA_Init (pDM_Odm);/* Gary */ +odm_DynamicBBPowerSavingInit (pDM_Odm); +odm_DynamicTxPowerInit (pDM_Odm); +odm_TXPowerTrackingInit (pDM_Odm); +ODM_EdcaTurboInit (pDM_Odm); +ODM_RAInfo_Init_all (pDM_Odm); +if ((pDM_Odm->AntDivType ==CG_TRX_HW_ANTDIV ) || + (pDM_Odm->AntDivType ==CGCS_RX_HW_ANTDIV ) || + (pDM_Odm->AntDivType ==CG_TRX_SMART_ANTDIV )) +odm_InitHybridAntDiv (pDM_Odm); +else if (pDM_Odm->AntDivType ==CGCS_RX_SW_ANTDIV ) +odm_SwAntDivInit (pDM_Odm); }/* 2011/09/20 MH This is the entry pointer for all team to execute HW out source DM. */
@@ -218,13 +214,10 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)else if (pDM_Odm->AntDivType ==CGCS_RX_SW_ANTDIV )odm_SwAntDivChkAntSwitch (pDM_Odm,SWAW_STEP_PEAK ); -if (pDM_Odm->SupportICType &ODM_IC_11AC_SERIES ) { - ; - }else if (pDM_Odm->SupportICType &ODM_IC_11N_SERIES ) { -ODM_TXPowerTrackingCheck (pDM_Odm); -odm_EdcaTurboCheck (pDM_Odm); -odm_DynamicTxPower (pDM_Odm); - } +ODM_TXPowerTrackingCheck (pDM_Odm); +odm_EdcaTurboCheck (pDM_Odm); +odm_DynamicTxPower (pDM_Odm); +odm_dtc (pDM_Odm); }
Signature · 1 line
2.33.0
PATCH 10/12 staging: r8188eu: remove dead code from odm.c
In reply to Michael Straube(pDM_Odm->SupportICType & ODM_IC_11N_SERIES) is true in this driver. There is an if statement that checks this. Remove it and its never executed else arm.
--- drivers/staging/r8188eu/hal/odm.c | 140 ++++++++++++++---------------- 1 file changed, 63 insertions(+), 77 deletions(-)
drivers/staging/r8188eu/hal/odm.c +63 -77
@@ -739,84 +739,70 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)if (!(pDM_Odm->SupportAbility &ODM_BB_FA_CNT ))return ; -if (pDM_Odm->SupportICType &ODM_IC_11N_SERIES ) { -/* hold ofdm counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_HOLDC_11N ,BIT (31 ),1 );/* hold page C counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (31 ),1 );/* hold page D counter */ - - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE1_11N , bMaskDWord); - FalseAlmCnt->Cnt_Fast_Fsync = (ret_value &0xffff ); - FalseAlmCnt->Cnt_SB_Search_fail = ((ret_value &0xffff0000 ) >>16 ); - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE2_11N , bMaskDWord); - FalseAlmCnt->Cnt_OFDM_CCA = (ret_value &0xffff ); - FalseAlmCnt->Cnt_Parity_Fail = ((ret_value &0xffff0000 ) >>16 ); - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE3_11N , bMaskDWord); - FalseAlmCnt->Cnt_Rate_Illegal = (ret_value &0xffff ); - FalseAlmCnt->Cnt_Crc8_fail = ((ret_value &0xffff0000 ) >>16 ); - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE4_11N , bMaskDWord); - FalseAlmCnt->Cnt_Mcs_fail = (ret_value &0xffff ); - - FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal + - FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail + - FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail; - -if (pDM_Odm->SupportICType ==ODM_RTL8188E ) { - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_SC_CNT_11N , bMaskDWord); - FalseAlmCnt->Cnt_BW_LSC = (ret_value &0xffff ); - FalseAlmCnt->Cnt_BW_USC = ((ret_value &0xffff0000 ) >>16 ); - } +/* hold ofdm counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_HOLDC_11N ,BIT (31 ),1 );/* hold page C counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (31 ),1 );/* hold page D counter */ + + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE1_11N , bMaskDWord); + FalseAlmCnt->Cnt_Fast_Fsync = (ret_value &0xffff ); + FalseAlmCnt->Cnt_SB_Search_fail = ((ret_value &0xffff0000 ) >>16 ); + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE2_11N , bMaskDWord); + FalseAlmCnt->Cnt_OFDM_CCA = (ret_value &0xffff ); + FalseAlmCnt->Cnt_Parity_Fail = ((ret_value &0xffff0000 ) >>16 ); + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE3_11N , bMaskDWord); + FalseAlmCnt->Cnt_Rate_Illegal = (ret_value &0xffff ); + FalseAlmCnt->Cnt_Crc8_fail = ((ret_value &0xffff0000 ) >>16 ); + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_TYPE4_11N , bMaskDWord); + FalseAlmCnt->Cnt_Mcs_fail = (ret_value &0xffff ); + + FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal + + FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail + + FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail; -/* hold cck counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (12 ),1 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (14 ),1 ); - - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_FA_LSB_11N , bMaskByte0); - FalseAlmCnt->Cnt_Cck_fail = ret_value; - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_FA_MSB_11N , bMaskByte3); - FalseAlmCnt->Cnt_Cck_fail += (ret_value &0xff ) <<8 ; - - ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_CCA_CNT_11N , bMaskDWord); - FalseAlmCnt->Cnt_CCK_CCA = ((ret_value &0xFF ) <<8 ) | ((ret_value &0xFF00 ) >>8 ); - - FalseAlmCnt->Cnt_all = (FalseAlmCnt->Cnt_Fast_Fsync + - FalseAlmCnt->Cnt_SB_Search_fail + - FalseAlmCnt->Cnt_Parity_Fail + - FalseAlmCnt->Cnt_Rate_Illegal + - FalseAlmCnt->Cnt_Crc8_fail + - FalseAlmCnt->Cnt_Mcs_fail + - FalseAlmCnt->Cnt_Cck_fail); - - FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA; - -if (pDM_Odm->SupportICType >=ODM_RTL8723A ) { -/* reset false alarm counter registers */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTC_11N ,BIT (31 ),1 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTC_11N ,BIT (31 ),0 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (27 ),1 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (27 ),0 ); -/* update ofdm counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_HOLDC_11N ,BIT (31 ),0 );/* update page C counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (31 ),0 );/* update page D counter */ - -/* reset CCK CCA counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (13 ) |BIT (12 ),0 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (13 ) |BIT (12 ),2 ); -/* reset CCK FA counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (15 ) |BIT (14 ),0 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (15 ) |BIT (14 ),2 ); - } - }else {/* FOR ODM_IC_11AC_SERIES */ -/* read OFDM FA counter */ - FalseAlmCnt->Cnt_Ofdm_fail =ODM_GetBBReg (pDM_Odm,ODM_REG_OFDM_FA_11AC , bMaskLWord); - FalseAlmCnt->Cnt_Cck_fail =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_FA_11AC , bMaskLWord); - FalseAlmCnt->Cnt_all = FalseAlmCnt->Cnt_Ofdm_fail + FalseAlmCnt->Cnt_Cck_fail; - -/* reset OFDM FA coutner */ -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RST_11AC ,BIT (17 ),1 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RST_11AC ,BIT (17 ),0 ); -/* reset CCK FA counter */ -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11AC ,BIT (15 ),0 ); -ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11AC ,BIT (15 ),1 ); +if (pDM_Odm->SupportICType ==ODM_RTL8188E ) { + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_SC_CNT_11N , bMaskDWord); + FalseAlmCnt->Cnt_BW_LSC = (ret_value &0xffff ); + FalseAlmCnt->Cnt_BW_USC = ((ret_value &0xffff0000 ) >>16 ); + } + +/* hold cck counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (12 ),1 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (14 ),1 ); + + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_FA_LSB_11N , bMaskByte0); + FalseAlmCnt->Cnt_Cck_fail = ret_value; + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_FA_MSB_11N , bMaskByte3); + FalseAlmCnt->Cnt_Cck_fail += (ret_value &0xff ) <<8 ; + + ret_value =ODM_GetBBReg (pDM_Odm,ODM_REG_CCK_CCA_CNT_11N , bMaskDWord); + FalseAlmCnt->Cnt_CCK_CCA = ((ret_value &0xFF ) <<8 ) | ((ret_value &0xFF00 ) >>8 ); + + FalseAlmCnt->Cnt_all = (FalseAlmCnt->Cnt_Fast_Fsync + + FalseAlmCnt->Cnt_SB_Search_fail + + FalseAlmCnt->Cnt_Parity_Fail + + FalseAlmCnt->Cnt_Rate_Illegal + + FalseAlmCnt->Cnt_Crc8_fail + + FalseAlmCnt->Cnt_Mcs_fail + + FalseAlmCnt->Cnt_Cck_fail); + + FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA; + +if (pDM_Odm->SupportICType >=ODM_RTL8723A ) { +/* reset false alarm counter registers */ +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTC_11N ,BIT (31 ),1 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTC_11N ,BIT (31 ),0 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (27 ),1 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (27 ),0 ); +/* update ofdm counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_HOLDC_11N ,BIT (31 ),0 );/* update page C counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_OFDM_FA_RSTD_11N ,BIT (31 ),0 );/* update page D counter */ + +/* reset CCK CCA counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (13 ) |BIT (12 ),0 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (13 ) |BIT (12 ),2 ); +/* reset CCK FA counter */ +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (15 ) |BIT (14 ),0 ); +ODM_SetBBReg (pDM_Odm,ODM_REG_CCK_FA_RST_11N ,BIT (15 ) |BIT (14 ),2 ); } }
Signature · 1 line
2.33.0
PATCH 11/12 staging: r8188eu: remove ODM_IC_11N_SERIES, ODM_IC_11AC_SERIES macros.
In reply to Michael StraubeThe macros ODM_IC_11N_SERIES and ODM_IC_11AC_SERIES are unused now. Remove them.
--- drivers/staging/r8188eu/include/odm.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/r8188eu/include/odm.h +0 -5
@@ -460,11 +460,6 @@ enum odm_ic_type { ODM_RTL8821 = BIT(6), }; -#define ODM_IC_11N_SERIES \ - (ODM_RTL8192S | ODM_RTL8192C | ODM_RTL8192D | \ - ODM_RTL8723A | ODM_RTL8188E) -#define ODM_IC_11AC_SERIES (ODM_RTL8812) -/* ODM_CMNINFO_CUT_VER */ enum odm_cut_version {ODM_CUT_A =1 ,
Signature · 1 line
2.33.0
PATCH 12/12 staging: r8188eu: remove header file odm_RegDefine11AC.h
In reply to Michael StraubeFinally the header odm_RegDefine11AC.h is unused now. Remove it.
--- .../r8188eu/include/odm_RegDefine11AC.h | 29 ------------------- drivers/staging/r8188eu/include/odm_precomp.h | 1 - 2 files changed, 30 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11AC.h
drivers/staging/r8188eu/include/odm_RegDefine11AC.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __ODM_REGDEFINE11AC_H__ -#define __ODM_REGDEFINE11AC_H__ - -/* 2 RF REG LIST */ - -/* 2 BB REG LIST */ -/* PAGE 8 */ -/* PAGE 9 */ -#define ODM_REG_OFDM_FA_RST_11AC 0x9A4 -/* PAGE A */ -#define ODM_REG_CCK_CCA_11AC 0xA0A -#define ODM_REG_CCK_FA_RST_11AC 0xA2C -#define ODM_REG_CCK_FA_11AC 0xA5C -/* PAGE C */ -#define ODM_REG_IGI_A_11AC 0xC50 -/* PAGE E */ -#define ODM_REG_IGI_B_11AC 0xE50 -/* PAGE F */ -#define ODM_REG_OFDM_FA_11AC 0xF48 - -/* 2 MAC REG LIST */ - -/* DIG Related */ -#define ODM_BIT_IGI_11AC 0xFFFFFFFF - -#endif
drivers/staging/r8188eu/include/odm_precomp.h +0 -1
@@ -18,7 +18,6 @@#include "odm.h" #include "odm_HWConfig.h" -#include "odm_RegDefine11AC.h" #include "odm_RegDefine11N.h" #include "HalPhyRf_8188e.h" /* for IQK,LCK,Power-tracking */
Signature · 1 line
2.33.0
Re: [PATCH 11/12] staging: r8188eu: remove ODM_IC_11N_SERIES, ODM_IC_11AC_SERIES macros.
In reply to Michael StraubeQuoted 4 lines · Michael Straube
The macros
ODM_IC_11N_SERIESandODM_IC_11AC_SERIESare unused now. Remove them.Signed-off-by Michael Straube <[email protected]>
I just noticed that there is a full stop at the end of the subject line, sorry. I'll fix it and send v2 soon.
Regards,
Michael