staging: rtl8723bs: clean up driver from private debug facilities
cover staging: rtl8723bs: clean up driver from private debug facilities
This patchset remove all private debug facilities. It removes unused macros and _do nothing_ ones (i.e. macros whose behaviour is activated by manual code update). Replace tracing macros wrapping raw printk calls by netdev_dbg() calls which is best suited for a network driver.
Remove all unused macros and function definition tied to the whole private tracing facility.
Fabio Aiuto (43):
staging: rtl8723bs: remove ODM_RT_TRACE logs
staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE
deletion
staging: rtl8723bs: remove empty functions
staging: rtl8723bs: remove empty .c source file
staging: rtl8723bs: remove undefined function prototypes
staging: rtl8723bs: remove empty header file
staging: rtl8723bs: remove ODM_RT_TRACE* unused macro defs
staging: rtl8723bs: remove all commented out ODM_RT_TRACE logs
staging: rtl8723bs: replace ODM_RT_ASSERT with netdev_dbg()
staging: rtl8723bs: remove unused ODM_RT_ASSERT macro
staging: rtl8723bs: remove unused ODM_PRINT_ADDR macro
staging: rtl8723bs: remove unused ODM_dbg_trace macro
staging: rtl8723bs: remove unused ODM_dbg_enter
staging: rtl8723bs: remove unused ODM_dbg_exit macro
staging: rtl8723bs: remove empty ifdef block
staging: rtl8723bs: remove unused ASSERT macro
staging: rtl8723bs: remove empty #ifndef block
staging: rtl8723bs: remove commented out RT_ASSERT occurrences
staging: rtl8723bs: remove unused RT_PRINTK macro
staging: rtl8723bs: remove BTC_PRINT logs
staging: rtl8723bs: remove empty if-else blocks after BTC_PRINT
removal
staging: rtl8723bs: remove braces around single statement in if block
staging: rtl8723bs: remove commented out BTC_PRINT logs
staging: rtl8723bs: remove BTC_PRINT macro definitions
staging: rtl8723bs: remove BTC_PRINT_ADDR macro definitions
staging: rtl8723bs: remove BTC_PRINT_DATA definitions
staging: rtl8723bs: remove BTC_PRINT_F macro definition
staging: rtl8723bs: remove empty #ifdef block
staging: rtl8723bs: remove unsed hal_btcoex_SetDBG() function
staging: rtl8723bs: remove hal_btcoex_GetDBG() function
staging: rtl8723bs: remove unnecessary halbtcoutsrc_DbgInit() function
staging: rtl8723bs: remove obsolete GLBtcDbgType array declarations
staging: rtl8723bs: remove unused enum
staging: rtl8723bs: remove obsolete debug macros
staging: rtl8723bs: remove commented out DbgPrint logs
staging: rtl8723bs: remove unused DbgPrint macro
staging: rtl8723bs: remove commented out *RT_DISP logs
staging: rtl8723bs: remove RT_DISP macro definition
staging: rtl8723bs: remove ODM_InitDebugSetting() function
staging: rtl8723bs: remove empty file
staging: rtl8723bs: remove member in dm_odm_t struct
staging: rtl8723bs: remove DebugLevel member in dm_odm_t struct
staging: rtl8723bs: remove odm_debug.h header file
drivers/staging/rtl8723bs/core/rtw_efuse.c | 1 - drivers/staging/rtl8723bs/core/rtw_recv.c | 22 - .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 604 +----------------- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 502 +-------------- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 67 -- .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 62 -- .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 49 -- .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 63 -- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 332 ---------- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 177 +---- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 171 ----- drivers/staging/rtl8723bs/hal/hal_com.c | 14 - drivers/staging/rtl8723bs/hal/odm.c | 53 +- drivers/staging/rtl8723bs/hal/odm.h | 4 - .../staging/rtl8723bs/hal/odm_CfoTracking.c | 107 ---- drivers/staging/rtl8723bs/hal/odm_DIG.c | 320 ---------- .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 18 - drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 38 -- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 27 - drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 34 - drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 21 - drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 1 - .../rtl8723bs/hal/odm_RegConfig8723B.c | 66 -- drivers/staging/rtl8723bs/hal/odm_debug.c | 44 -- drivers/staging/rtl8723bs/hal/odm_debug.h | 165 ----- drivers/staging/rtl8723bs/hal/odm_precomp.h | 2 - .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 7 - .../staging/rtl8723bs/include/hal_btcoex.h | 2 - 29 files changed, 6 insertions(+), 2970 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h
Signature · 1 line
2.20.1
PATCH 1/43 staging: rtl8723bs: remove ODM_RT_TRACE logs
remove all ODM_RT_TRACE logs.
ODM_RT_TRACE macro default behaviour is _trace nothing_. To enable it a hand code edit is needed in hal/odm_debug.c.
So just remove it.
Applied the semantic patch:
@@
@@
- ODM_RT_TRACE(...);
--- .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 62 ---- .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 49 --- .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 63 ---- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 325 +----------------- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 140 +------- drivers/staging/rtl8723bs/hal/odm.c | 34 -- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 107 ------ drivers/staging/rtl8723bs/hal/odm_DIG.c | 319 ----------------- .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 18 - drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 18 - .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 27 -- drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 14 +- .../rtl8723bs/hal/odm_RegConfig8723B.c | 66 ---- 13 files changed, 7 insertions(+), 1235 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +0 -62
@@ -33,47 +33,6 @@ static bool CheckPositive( pDM_Odm->TypeALNA <<16 | pDM_Odm->TypeAPA <<24 ; -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_TRACE , - ( -"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n" , - cond1, - cond2 - ) - ); -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_TRACE , - ( -"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n" , - driver1, - driver2 - ) - ); - -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_TRACE , - (" (Platform, Interface) = (0x%X, 0x%X)\n" , - pDM_Odm->SupportPlatform, - pDM_Odm->SupportInterface - ) - ); -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_TRACE , - ( -" (Board, Package) = (0x%X, 0x%X)\n" , - pDM_Odm->BoardType, - pDM_Odm->PackageType - ) - ); -/* Value Defined Check =============== */ /* QFN Type [15:12] and Cut Version [27:24] need to do value check */
@@ -263,13 +222,6 @@ void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct dm_odm_t *pDM_Odm)u32 ArrayLen =ARRAY_SIZE (Array_MP_8723B_AGC_TAB);u32 *Array = Array_MP_8723B_AGC_TAB; -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_LOUD , - ("===> ODM_ReadAndConfig_MP_8723B_AGC_TAB\n" ) - ); -for (i =0 ; i < ArrayLen; i +=2 ) {u32 v1 = Array[i];u32 v2 = Array[i+1 ];
@@ -532,13 +484,6 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm)u32 ArrayLen =ARRAY_SIZE (Array_MP_8723B_PHY_REG);u32 *Array = Array_MP_8723B_PHY_REG; -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_LOUD , - ("===> ODM_ReadAndConfig_MP_8723B_PHY_REG\n" ) - ); -for (i =0 ; i < ArrayLen; i +=2 ) {u32 v1 = Array[i];u32 v2 = Array[i+1 ];
@@ -611,13 +556,6 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm)u32 i =0 ;u32 *Array = Array_MP_8723B_PHY_REG_PG; -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_INIT , -ODM_DBG_LOUD , - ("===> ODM_ReadAndConfig_MP_8723B_PHY_REG_PG\n" ) - ); - pDM_Odm->PhyRegPgVersion =1 ; pDM_Odm->PhyRegPgValueType =PHY_REG_PG_EXACT_VALUE ;
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +0 -49
61 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c +0 -63
87 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPhyRf.c +3 -322
447 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +2 -138
497 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm.c +0 -34
@@ -323,32 +323,10 @@ static void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm)static void odm_CmnInfoInit_Debug (struct dm_odm_t *pDM_Odm) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("odm_CmnInfoInit_Debug ==>\n" )); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportPlatform =%d\n" , pDM_Odm->SupportPlatform)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportAbility = 0x%x\n" , pDM_Odm->SupportAbility)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportInterface =%d\n" , pDM_Odm->SupportInterface)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportICType = 0x%x\n" , pDM_Odm->SupportICType)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("CutVersion =%d\n" , pDM_Odm->CutVersion)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("FabVersion =%d\n" , pDM_Odm->FabVersion)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("RFType =%d\n" , pDM_Odm->RFType)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("BoardType =%d\n" , pDM_Odm->BoardType)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("ExtLNA =%d\n" , pDM_Odm->ExtLNA)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("ExtPA =%d\n" , pDM_Odm->ExtPA)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("ExtTRSW =%d\n" , pDM_Odm->ExtTRSW)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("PatchID =%d\n" , pDM_Odm->PatchID)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("bInHctTest =%d\n" , pDM_Odm->bInHctTest)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("bWIFITest =%d\n" , pDM_Odm->bWIFITest)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("bDualMacSmartConcurrent =%d\n" , pDM_Odm->bDualMacSmartConcurrent)); - }static void odm_BasicDbgMessage (struct dm_odm_t *pDM_Odm) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("odm_BasicDbgMsg ==>\n" )); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("bLinked = %d, RSSI_Min = %d,\n" , - pDM_Odm->bLinked, pDM_Odm->RSSI_Min)); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("RxRate = 0x%x, RSSI_A = %d, RSSI_B = %d\n" , - pDM_Odm->RxRate, pDM_Odm->RSSI_A, pDM_Odm->RSSI_B)); }/* 3 ============================================================ */
@@ -482,9 +460,6 @@ u32 ODM_Get_Rate_Bitmap(break ; } -/* printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n", __func__, rssi_level, WirelessMode, rate_bitmap); */ -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_LOUD , (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n" , rssi_level, WirelessMode, rate_bitmap)); -return ra_mask & rate_bitmap; }
@@ -495,12 +470,10 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)struct adapter *padapter = pDM_Odm->Adapter;if (padapter->bDriverStopped) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_TRACE , ("<---- odm_RefreshRateAdaptiveMask(): driver is going to unload\n" ));return ; }if (!pDM_Odm->bUseRAMask) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_LOUD , ("<---- odm_RefreshRateAdaptiveMask(): driver does not control rate adaptive mask\n" ));return ; }
@@ -512,7 +485,6 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)continue ;if (true ==ODM_RAStateCheck (pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_LOUD , ("RSSI:%d, RSSI_LEVEL:%d\n" , pstat->rssi_stat.UndecoratedSmoothedPWDB, pstat->rssi_level));/* printk("RSSI:%d, RSSI_LEVEL:%d\n", pstat->rssi_stat.UndecoratedSmoothedPWDB, pstat->rssi_level); */ rtw_hal_update_ra_mask (pstat, pstat->rssi_level); }
@@ -541,9 +513,7 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)static void odm_RefreshRateAdaptiveMask (struct dm_odm_t *pDM_Odm) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_TRACE , ("odm_RefreshRateAdaptiveMask()---------->\n" ));if (!(pDM_Odm->SupportAbility &ODM_BB_RA_MASK )) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_TRACE , ("odm_RefreshRateAdaptiveMask(): Return cos not supported\n" ));return ; }odm_RefreshRateAdaptiveMaskCE (pDM_Odm);
@@ -596,7 +566,6 @@ bool ODM_RAStateCheck(/* printk("==>%s, RATRState:0x%02x , RSSI:%d\n", __func__, RATRState, RSSI); */ if (*pRATRState != RATRState || bForceUpdate) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_RA_MASK ,ODM_DBG_LOUD , ("RSSI Level %d -> %d\n" , *pRATRState, RATRState)); *pRATRState = RATRState;return true; }
@@ -858,7 +827,6 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm)odm_BasicDbgMessage (pDM_Odm);odm_FalseAlarmCounterStatistics (pDM_Odm);odm_NHMCounterStatistics (pDM_Odm); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_DIG ,ODM_DBG_LOUD , ("odm_DIG(): RSSI = 0x%x\n" , pDM_Odm->RSSI_Min));odm_RSSIMonitorCheck (pDM_Odm);
@@ -872,8 +840,6 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm)/* (pDM_Odm->SupportICType & (ODM_RTL8188E) &&(&&(((pDM_Odm->SupportInterface == ODM_ITRF_SDIO))) */ /* */ ) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_DIG ,ODM_DBG_LOUD , ("----Step1: odm_DIG is in LPS mode\n" )); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_DIG ,ODM_DBG_LOUD , ("---Step2: 8723AS is in LPS mode\n" ));odm_DIGbyRSSI_LPS (pDM_Odm); } elseodm_DIG (pDM_Odm );
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c +0 -107
171 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm_DIG.c +0 -319
578 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c +0 -18
@@ -37,19 +37,6 @@ void ODM_EdcaTurboInit(void *pDM_VOID) pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false; Adapter->recvpriv.bIsAnyNonBEPkts = false; - -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("Original VO PARAM: 0x%x\n" , -rtw_read32 (pDM_Odm->Adapter,ODM_EDCA_VO_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("Original VI PARAM: 0x%x\n" , -rtw_read32 (pDM_Odm->Adapter,ODM_EDCA_VI_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("Original BE PARAM: 0x%x\n" , -rtw_read32 (pDM_Odm->Adapter,ODM_EDCA_BE_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("Original BK PARAM: 0x%x\n" , -rtw_read32 (pDM_Odm->Adapter,ODM_EDCA_BK_PARAM ))); }/* ODM_InitEdcaTurbo */ void odm_EdcaTurboCheck (void *pDM_VOID)
@@ -60,15 +47,10 @@ void odm_EdcaTurboCheck(void *pDM_VOID)*/ struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("odm_EdcaTurboCheck ========================>\n" )); -if (!(pDM_Odm->SupportAbility &ODM_MAC_EDCA_TURBO ))return ;odm_EdcaTurboCheckCE (pDM_Odm); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , - ("<========================odm_EdcaTurboCheck\n" )); }/* odm_CheckEdcaTurbo */ void odm_EdcaTurboCheckCE (void *pDM_VOID)
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +0 -18
@@ -427,12 +427,6 @@ enum hal_status ODM_ConfigRFWithHeaderFile(enum odm_rf_radio_path_e eRFPath ) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - ("===>ODM_ConfigRFWithHeaderFile (%s)\n" , (pDM_Odm->bIsMPChip) ?"MPChip" :"TestChip" )); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - ("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n" , - pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType)); -if (ConfigType ==CONFIG_RF_RADIO )READ_AND_CONFIG (8723B , _RadioA);else if (ConfigType ==CONFIG_RF_TXPWR_LMT )
@@ -443,12 +437,6 @@ enum hal_status ODM_ConfigRFWithHeaderFile(enum hal_status ODM_ConfigRFWithTxPwrTrackHeaderFile (struct dm_odm_t *pDM_Odm) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - ("===>ODM_ConfigRFWithTxPwrTrackHeaderFile (%s)\n" , (pDM_Odm->bIsMPChip) ?"MPChip" :"TestChip" )); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - ("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n" , - pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType)); -if (pDM_Odm->SupportInterface ==ODM_ITRF_SDIO )READ_AND_CONFIG (8723B , _TxPowerTrack_SDIO);
@@ -459,12 +447,6 @@ enum hal_status ODM_ConfigBBWithHeaderFile( struct dm_odm_t *pDM_Odm, enum ODM_BB_Config_Type ConfigType ) { - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, - ("===>ODM_ConfigBBWithHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip")); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_LOUD , - ("pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n" , - pDM_Odm->SupportPlatform, pDM_Odm->SupportInterface, pDM_Odm->BoardType)); -if (ConfigType ==CONFIG_BB_PHY_REG )READ_AND_CONFIG (8723B , _PHY_REG);else if (ConfigType ==CONFIG_BB_AGC_TAB )
drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +0 -27
@@ -38,8 +38,6 @@ static s16 odm_InbandNoise_Monitor_NSeries(else max_rf_path =1 ; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("odm_DebugControlInbandNoise_Nseries() ==>\n" )); -memset (&noise_data,0 ,sizeof (struct noise_level ));/* */
@@ -64,7 +62,6 @@ static s16 odm_InbandNoise_Monitor_NSeries(/* Read Noise Floor Report */ tmp4b =PHY_QueryBBReg (pDM_Odm->Adapter,0x8f8 , bMaskDWord); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("Noise Floor Report (0x8f8) = 0x%08x\n" , tmp4b));/* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ /* if (max_rf_path == 2) */
@@ -76,17 +73,10 @@ static s16 odm_InbandNoise_Monitor_NSeries( noise_data.value[ODM_RF_PATH_A ] = (u8)(tmp4b&0xff ); noise_data.value[ODM_RF_PATH_B ] = (u8)((tmp4b&0xff00 )>>8 ); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("value_a = 0x%x(%d), value_b = 0x%x(%d)\n" , - noise_data.value[ODM_RF_PATH_A ], noise_data.value[ODM_RF_PATH_A ], noise_data.value[ODM_RF_PATH_B ], noise_data.value[ODM_RF_PATH_B ])); -for (rf_path =ODM_RF_PATH_A ; rf_path < max_rf_path; rf_path++) { noise_data.sval[rf_path] = (s8 )noise_data.value[rf_path]; noise_data.sval[rf_path] /=2 ; } - - -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("sval_a = %d, sval_b = %d\n" , - noise_data.sval[ODM_RF_PATH_A ], noise_data.sval[ODM_RF_PATH_B ]));/* mdelay(10); */ /* msleep(10); */
@@ -94,11 +84,8 @@ static s16 odm_InbandNoise_Monitor_NSeries(if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { noise_data.valid_cnt[rf_path]++; noise_data.sum[rf_path] += noise_data.sval[rf_path]; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("RF_Path:%d Valid sval = %d\n" , rf_path, noise_data.sval[rf_path])); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("Sum of sval = %d,\n" , noise_data.sum[rf_path]));if (noise_data.valid_cnt[rf_path] == ValidCnt) { valid_done++; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("After divided, RF_Path:%d , sum = %d\n" , rf_path, noise_data.sum[rf_path])); } }
@@ -119,37 +106,23 @@ static s16 odm_InbandNoise_Monitor_NSeries( } reg_c50 = (s32 )PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); reg_c50 &= ~BIT7 ; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("0x%x = 0x%02x(%d)\n" , rOFDM0_XAAGCCore1, reg_c50, reg_c50)); pDM_Odm->noise_level.noise[ODM_RF_PATH_A ] =-110 + reg_c50 + noise_data.sum[ODM_RF_PATH_A ]; pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[ODM_RF_PATH_A ];if (max_rf_path ==2 ) { reg_c58 = (s32 )PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); reg_c58 &= ~BIT7 ; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("0x%x = 0x%02x(%d)\n" , rOFDM0_XBAGCCore1, reg_c58, reg_c58)); pDM_Odm->noise_level.noise[ODM_RF_PATH_B ] =-110 + reg_c58 + noise_data.sum[ODM_RF_PATH_B ]; pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[ODM_RF_PATH_B ]; } pDM_Odm->noise_level.noise_all /= max_rf_path; -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_COMMON , -ODM_DBG_LOUD , - ( -"noise_a = %d, noise_b = %d\n" , - pDM_Odm->noise_level.noise[ODM_RF_PATH_A ], - pDM_Odm->noise_level.noise[ODM_RF_PATH_B ] - ) - ); -/* */ /* Step 4. Recover the Dig */ /* */ if (bPauseDIG)odm_PauseDIG (pDM_Odm,ODM_RESUME_DIG , IGIValue); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("odm_DebugControlInbandNoise_Nseries() <==\n" ));return pDM_Odm->noise_level.noise_all; }
drivers/staging/rtl8723bs/hal/odm_PathDiv.c +2 -12
@@ -12,12 +12,7 @@ void odm_PathDiversityInit(void *pDM_VOID)struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;if (!(pDM_Odm->SupportAbility &ODM_BB_PATH_DIV )) -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_PATH_DIV , -ODM_DBG_LOUD , - ("Return: Not Support PathDiv\n" ) - ); + {} }void odm_PathDiversity (void *pDM_VOID)
@@ -25,10 +20,5 @@ void odm_PathDiversity(void *pDM_VOID)struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;if (!(pDM_Odm->SupportAbility &ODM_BB_PATH_DIV )) -ODM_RT_TRACE ( - pDM_Odm, -ODM_COMP_PATH_DIV , -ODM_DBG_LOUD , - ("Return: Not Support PathDiv\n" ) - ); + {} }
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +0 -66
107 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/43 staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion
In reply to Fabio Aiutoremove if-else blocks left empty by ODM_RT_TRACE deletion. remove unused variables to suppress compiler warnings.
--- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 13 ------------- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 9 +-------- drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 8 -------- 3 files changed, 1 insertion(+), 29 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -13
@@ -118,9 +118,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)/* 4 3. Initialize ThermalValues of RFCalibrateInfo */ -if (pDM_Odm->RFCalibrateInfo.bReloadtxpowerindex) - {} -/* 4 4. Calculate average thermal meter */ pDM_Odm->RFCalibrateInfo.ThermalValue_AVG[pDM_Odm->RFCalibrateInfo.ThermalValue_AVG_index] = ThermalValue;
@@ -273,16 +270,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)/* to increase TX power. Otherwise, EVM will be bad. */ /* */ /* 2012/04/25 MH Add for tx power tracking to set tx power in tx agc for 88E. */ -if (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue) { -if (c.RfPathCount >1 ) - {} - - }else if (ThermalValue < pDM_Odm->RFCalibrateInfo.ThermalValue) {/* Low temperature */ - -if (c.RfPathCount >1 ) - {} - - }if (ThermalValue > pHalData->EEPROMThermalMeter) {for (p =ODM_RF_PATH_A ; p < c.RfPathCount; p++)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +1 -8
@@ -689,8 +689,7 @@ static u8 phy_PathA_RxIQK8723B( (tmp < 0xf) ) result |=0x02 ; - else /* if Tx not OK, ignore Rx */ - {} +return result; }
@@ -988,8 +987,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB) (tmp < 0xf) ) result |=0x02 ; - else - {}return result; }
@@ -1500,7 +1497,6 @@ static void phy_IQCalibrate_8723B( result[t][2 ] = (PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000 )>>16 ; result[t][3 ] = (PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000 )>>16 ;break ; - }else { } }
@@ -1533,13 +1529,10 @@ static void phy_IQCalibrate_8723B( result[t][6 ] = (PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000 )>>16 ; result[t][7 ] = (PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000 )>>16 ;break ; - }else { } }/* Allen end */ -if (0x00 == PathBOK) { - } }/* Back to BB mode, load original value */
drivers/staging/rtl8723bs/hal/odm_PathDiv.c +0 -8
@@ -9,16 +9,8 @@void odm_PathDiversityInit (void *pDM_VOID) { -struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; - -if (!(pDM_Odm->SupportAbility &ODM_BB_PATH_DIV )) - {} }void odm_PathDiversity (void *pDM_VOID) { -struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; - -if (!(pDM_Odm->SupportAbility &ODM_BB_PATH_DIV )) - {} }
Signature · 1 line
2.20.1
PATCH 3/43 staging: rtl8723bs: remove empty functions
In reply to Fabio Aiutoremove functions left empty after ODM_RT_TRACE deletion.
--- drivers/staging/rtl8723bs/hal/odm.c | 4 ---- drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 7 ------- 2 files changed, 11 deletions(-)
drivers/staging/rtl8723bs/hal/odm.c +0 -4
@@ -807,9 +807,6 @@ void ODM_DMInit(struct dm_odm_t *pDM_Odm)ODM_ClearTxPowerTrackingState (pDM_Odm); -if (*(pDM_Odm->mp_mode) !=1 ) -odm_PathDiversityInit (pDM_Odm); -odm_DynamicBBPowerSavingInit (pDM_Odm);odm_DynamicTxPowerInit (pDM_Odm);
@@ -857,7 +854,6 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm)odm_RefreshRateAdaptiveMask (pDM_Odm);odm_EdcaTurboCheck (pDM_Odm); -odm_PathDiversity (pDM_Odm);ODM_CfoTracking (pDM_Odm);ODM_TXPowerTrackingCheck (pDM_Odm);
drivers/staging/rtl8723bs/hal/odm_PathDiv.c +0 -7
@@ -7,10 +7,3 @@#include "odm_precomp.h" -void odm_PathDiversityInit (void *pDM_VOID) -{ -} - -void odm_PathDiversity (void *pDM_VOID) -{ -}
Signature · 1 line
2.20.1
PATCH 4/43 staging: rtl8723bs: remove empty .c source file
In reply to Fabio Aiutoremove empty .c source file
--- drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c
drivers/staging/rtl8723bs/hal/odm_PathDiv.c deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -******************************************************************************/ - -#include "odm_precomp.h" -
Signature · 1 line
2.20.1
PATCH 5/43 staging: rtl8723bs: remove undefined function prototypes
In reply to Fabio Aiutoremove undefined function prototypes.
--- drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/rtl8723bs/hal/odm_PathDiv.h +0 -10
@@ -8,14 +8,4 @@#ifndef __ODMPATHDIV_H__#define __ODMPATHDIV_H__ -void -odm_PathDiversityInit ( -void *pDM_VOID - ); - -void -odm_PathDiversity ( -void *pDM_VOID - ); -#endif /* ifndef __ODMPATHDIV_H__ */
Signature · 1 line
2.20.1
PATCH 6/43 staging: rtl8723bs: remove empty header file
In reply to Fabio Aiutoremove empty header file.
--- drivers/staging/rtl8723bs/hal/odm.h | 1 - drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 11 ----------- drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - 3 files changed, 13 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h
drivers/staging/rtl8723bs/hal/odm.h +0 -1
@@ -11,7 +11,6 @@#include "odm_EdcaTurboCheck.h" #include "odm_DIG.h" -#include "odm_PathDiv.h" #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h"
drivers/staging/rtl8723bs/hal/odm_PathDiv.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -******************************************************************************/ - -#ifndef __ODMPATHDIV_H__ -#define __ODMPATHDIV_H__ - -#endif /* ifndef __ODMPATHDIV_H__ */
drivers/staging/rtl8723bs/hal/odm_precomp.h +0 -1
@@ -31,7 +31,6 @@#include "odm_RegDefine11N.h" #include "odm_EdcaTurboCheck.h" #include "odm_DIG.h" -#include "odm_PathDiv.h" #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h"
Signature · 1 line
2.20.1
PATCH 7/43 staging: rtl8723bs: remove ODM_RT_TRACE* unused macro defs
In reply to Fabio Aiutoremove unused ODM_RT_TRACE* macro defs.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 23 ----------------------- 1 file changed, 23 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -23
@@ -96,27 +96,6 @@#endif #if DBG -#define ODM_RT_TRACE (pDM_Odm, comp, level, fmt)\ - do {\ - if (\ - (comp & pDM_Odm->DebugComponents) &&\ - (level <= pDM_Odm->DebugLevel ||\ - level == ODM_DBG_SERIOUS)\ - ) {\ - RT_PRINTK fmt;\ - } \ - } while (0) - -#define ODM_RT_TRACE_F (pDM_Odm, comp, level, fmt)\ - do {\ - if (\ - (comp & pDM_Odm->DebugComponents) &&\ - (level <= pDM_Odm->DebugLevel)\ - ) {\ - RT_PRINTK fmt;\ - } \ - } while (0) -#define ODM_RT_ASSERT (pDM_Odm, expr, fmt)\ do {\ if (!expr) {\
@@ -150,8 +129,6 @@ } \ } while (0)#else -#define ODM_RT_TRACE (pDM_Odm, comp, level, fmt) no_printk fmt -#define ODM_RT_TRACE_F (pDM_Odm, comp, level, fmt) no_printk fmt#define ODM_RT_ASSERT (pDM_Odm, expr, fmt) no_printk fmt#define ODM_dbg_enter () do {} while (0)#define ODM_dbg_exit () do {} while (0)
Signature · 1 line
2.20.1
PATCH 8/43 staging: rtl8723bs: remove all commented out ODM_RT_TRACE logs
In reply to Fabio Aiutoremove all commented out ODM_RT_TRACE logs.
--- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 32 ------------------- drivers/staging/rtl8723bs/hal/odm.c | 3 -- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 1 - 3 files changed, 36 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -32
@@ -421,7 +421,6 @@ static u8 phy_PathA_IQK_8723B(PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK, bMaskDWord,0x01007c00 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK, bMaskDWord,0x01004800 );/* path-A IQK setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-A IQK setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_A, bMaskDWord,0x18008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_A, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );
@@ -433,7 +432,6 @@ static u8 phy_PathA_IQK_8723B(PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x00462911 );/* enter IQK mode */
@@ -451,12 +449,10 @@ static u8 phy_PathA_IQK_8723B(PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path A LOK & IQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path A LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME_8723B)); */ /* PlatformStallExecution(IQK_DELAY_TIME_8723B*1000); */ mdelay (IQK_DELAY_TIME_8723B );
@@ -505,8 +501,6 @@ static u8 phy_PathA_RxIQK8723B(struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A Rx IQK!\n")); */ -/* Save RF Path */ Path_SEL_BB =PHY_QueryBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord);
@@ -514,7 +508,6 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 );/* 1 Get TXIMR setting */ /* modify RXIQK mode table */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-A Rx IQK modify RXIQK mode table!\n")); */ PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0001f );
@@ -540,7 +533,6 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x0046a911 );/* enter IQK mode */
@@ -558,12 +550,10 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path A LOK & IQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path A LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME_8723B)); */ /* PlatformStallExecution(IQK_DELAY_TIME_8723B*1000); */ mdelay (IQK_DELAY_TIME_8723B );
@@ -601,7 +591,6 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK, bMaskDWord, u4tmp);/* modify RXIQK mode table */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-A Rx IQK modify RXIQK mode table 2!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );
@@ -631,7 +620,6 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x0046a8d1 );/* enter IQK mode */
@@ -649,12 +637,10 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path A LOK & IQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path A LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME_88E)); */ /* PlatformStallExecution(IQK_DELAY_TIME_8723B*1000); */ mdelay (IQK_DELAY_TIME_8723B );
@@ -723,7 +709,6 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK, bMaskDWord,0x01007c00 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK, bMaskDWord,0x01004800 );/* path-A IQK setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-B IQK setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_A, bMaskDWord,0x18008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_A, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );
@@ -736,7 +721,6 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x00462911 );/* enter IQK mode */
@@ -750,12 +734,10 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path B LOK & IQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path B LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path B LOK & IQK.\n", IQK_DELAY_TIME_88E)); */ /* PlatformStallExecution(IQK_DELAY_TIME_88E*1000); */ mdelay (IQK_DELAY_TIME_8723B );
@@ -767,9 +749,6 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)/* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 ); -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0x948 = 0x%x\n", PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord))); */ - -/* Check failed */ regEAC =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord); regE94 =PHY_QueryBBReg (pDM_Odm->Adapter, rTx_Power_Before_IQK_A, bMaskDWord);
@@ -801,8 +780,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct dm_odm_t *pDM_Odm = &pHalData->odmpriv; -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B Rx IQK!\n")); */ -/* Save RF Path */ Path_SEL_BB =PHY_QueryBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord);/* leave IQK mode */
@@ -811,7 +788,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)/* switch to path B */ PHY_SetBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord,0x00000280 );/* modify RXIQK mode table */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path-A Rx IQK modify RXIQK mode table!\n")); */ PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );PHY_SetRFReg (pDM_Odm->Adapter,ODM_RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0001f );
@@ -839,7 +815,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x0046a911 );/* enter IQK mode */
@@ -853,13 +828,11 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path B TXIQK @ RXIQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path B LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME_88E)); */ /* PlatformStallExecution(IQK_DELAY_TIME_88E*1000); */ mdelay (IQK_DELAY_TIME_8723B );
@@ -878,10 +851,8 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)/* Allen 20131125 */ tmp = (regE9C &0x03FF0000 )>>16 ; -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("tmp1 = 0x%x\n", tmp)); */ if ((tmp &0x200 ) >0 ) tmp =0x400 - tmp; -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("tmp2 = 0x%x\n", tmp)); */ if ( !(regEAC & BIT28) &&
@@ -931,7 +902,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );/* LO calibration setting */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("LO calibration setting!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Rsp, bMaskDWord,0x0046a8d1 );/* enter IQK mode */
@@ -945,12 +915,10 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );/* One shot, path B LOK & IQK */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("One shot, path B LOK & IQK!\n")); */ PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf9000000 );PHY_SetBBReg (pDM_Odm->Adapter, rIQK_AGC_Pts, bMaskDWord,0xf8000000 );/* delay x ms */ -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME_88E)); */ /* PlatformStallExecution(IQK_DELAY_TIME_88E*1000); */ mdelay (IQK_DELAY_TIME_8723B );
drivers/staging/rtl8723bs/hal/odm.c +0 -3
@@ -600,11 +600,8 @@ static void FindMinimumRSSI(struct adapter *padapter) (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0) ) { pdmpriv->MinUndecoratedPWDBForDM =0 ; -/* ODM_RT_TRACE(pDM_Odm, COMP_BB_POWERSAVING, DBG_LOUD, ("Not connected to any\n")); */ }else pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; - -/* ODM_RT_TRACE(pDM_Odm, COMP_DIG, DBG_LOUD, ("MinUndecoratedPWDBForDM =%d\n", pHalData->MinUndecoratedPWDBForDM)); */ }static void odm_RSSIMonitorCheckCE (struct dm_odm_t *pDM_Odm)
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +0 -1
@@ -186,7 +186,6 @@ static void odm_RxPhyStatus92CSeries_Parsing(/* RT_DISP(FRX, RX_PHY_SS, ("PWDB_ALL =%d\n", PWDB_ALL)); */ pPhyInfo->rx_pwd_ba11 =PWDB_ALL ; -/* ODM_RT_TRACE(pDM_Odm, ODM_COMP_RSSI_MONITOR, ODM_DBG_LOUD, ("ODM OFDM RSSI =%d\n", pPhyInfo->rx_pwd_ba11)); */ pPhyInfo->bt_rx_rssi_percentage =PWDB_ALL_BT ; pPhyInfo->rx_power = rx_pwr_all; pPhyInfo->recv_signal_power = rx_pwr_all;
Signature · 1 line
2.20.1
PATCH 9/43 staging: rtl8723bs: replace ODM_RT_ASSERT with netdev_dbg()
In reply to Fabio Aiutoreplace ODM_RT_ASSERT with netdev dbg.
Marco ODM_RT_ASSERT wraps a raw prink and prints a message everytime second argument is false. This occurrence prints always, so replace it with netdev_dbg()
--- drivers/staging/rtl8723bs/hal/odm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm.c +2 -1
@@ -552,7 +552,8 @@ bool ODM_RAStateCheck(break ;default : -ODM_RT_ASSERT (pDM_Odm, false, ("wrong rssi level setting %d !" , *pRATRState)); +netdev_dbg (pDM_Odm->Adapter->pnetdev, +"wrong rssi level setting %d !" , *pRATRState);break ; }
Signature · 1 line
2.20.1
PATCH 10/43 staging: rtl8723bs: remove unused ODM_RT_ASSERT macro
In reply to Fabio Aiutoremove unused ODM_RT_ASSERT macro declarations.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -15
@@ -96,20 +96,6 @@#endif #if DBG -#define ODM_RT_ASSERT (pDM_Odm, expr, fmt)\ - do {\ - if (!expr) {\ - DbgPrint("Assertion failed! %s at ......\n", #expr);\ - DbgPrint(\ - " ......%s,%s, line =%d\n",\ - __FILE__,\ - __func__,\ - __LINE__\ - );\ - RT_PRINTK fmt;\ - ASSERT(false);\ - } \ - } while (0)#define ODM_dbg_trace (str) { DbgPrint("%s:%s\n", __func__, str); }#define ODM_PRINT_ADDR (pDM_Odm, comp, level, title_str, ptr)\
@@ -129,7 +115,6 @@ } \ } while (0)#else -#define ODM_RT_ASSERT (pDM_Odm, expr, fmt) no_printk fmt#define ODM_dbg_enter () do {} while (0)#define ODM_dbg_exit () do {} while (0)#define ODM_dbg_trace (str) no_printk("%s", str)
Signature · 1 line
2.20.1
PATCH 11/43 staging: rtl8723bs: remove unused ODM_PRINT_ADDR macro
In reply to Fabio Aiutoremove unused ODM_PRINT_ADDR macro definitions.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -19
@@ -97,29 +97,10 @@#if DBG #define ODM_dbg_trace (str) { DbgPrint("%s:%s\n", __func__, str); } - -#define ODM_PRINT_ADDR (pDM_Odm, comp, level, title_str, ptr)\ - do {\ - if (\ - (comp & pDM_Odm->DebugComponents) &&\ - (level <= pDM_Odm->DebugLevel)\ - ) {\ - int __i;\ - u8 *__ptr = (u8 *)ptr;\ - DbgPrint("[ODM] ");\ - DbgPrint(title_str);\ - DbgPrint(" ");\ - for (__i = 0; __i < 6; __i++)\ - DbgPrint("%02X%s", __ptr[__i], (__i == 5) ? "" : "-");\ - DbgPrint("\n");\ - } \ - } while (0)#else #define ODM_dbg_enter () do {} while (0)#define ODM_dbg_exit () do {} while (0)#define ODM_dbg_trace (str) no_printk("%s", str) -#define ODM_PRINT_ADDR (pDM_Odm, comp, level, title_str, ptr) \ - no_printk("%s %p", title_str, ptr)#endif void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 12/43 staging: rtl8723bs: remove unused ODM_dbg_trace macro
In reply to Fabio Aiutoremove unused ODM_dbg_trace macro definitions.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -2
@@ -96,11 +96,9 @@#endif #if DBG -#define ODM_dbg_trace (str) { DbgPrint("%s:%s\n", __func__, str); }#else #define ODM_dbg_enter () do {} while (0)#define ODM_dbg_exit () do {} while (0) -#define ODM_dbg_trace (str) no_printk("%s", str)#endif void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 13/43 staging: rtl8723bs: remove unused ODM_dbg_enter
In reply to Fabio Aiutoremove unused ODM_dbg_enter macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -1
@@ -97,7 +97,6 @@#if DBG #else -#define ODM_dbg_enter () do {} while (0)#define ODM_dbg_exit () do {} while (0)#endif
Signature · 1 line
2.20.1
PATCH 14/43 staging: rtl8723bs: remove unused ODM_dbg_exit macro
In reply to Fabio Aiutoremove unused ODM_dbg_exit macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -1
@@ -97,7 +97,6 @@#if DBG #else -#define ODM_dbg_exit () do {} while (0)#endif void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 15/43 staging: rtl8723bs: remove empty ifdef block
In reply to Fabio Aiutoremove empty ifdef block
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -4
@@ -95,10 +95,6 @@#define ASSERT (expr)#endif -#if DBG -#else -#endif -void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);#endif /* __ODM_DBG_H__ */
Signature · 1 line
2.20.1
PATCH 16/43 staging: rtl8723bs: remove unused ASSERT macro
In reply to Fabio Aiutoremove unused do nothing ASSERT macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -1
@@ -92,7 +92,6 @@#define RT_DISP (dbgtype, dbgflag, printstr)#ifndef ASSERT -#define ASSERT (expr)#endif void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 17/43 staging: rtl8723bs: remove empty #ifndef block
In reply to Fabio Aiutoremove empty ifndef block.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -3
@@ -91,9 +91,6 @@ DbgPrint("%s(): " fmt, __func__, ## args) #define RT_DISP(dbgtype, dbgflag, printstr) -#ifndef ASSERT -#endif - void ODM_InitDebugSetting(struct dm_odm_t *pDM_Odm);#endif /* __ODM_DBG_H__ */
Signature · 1 line
2.20.1
PATCH 18/43 staging: rtl8723bs: remove commented out RT_ASSERT occurrences
In reply to Fabio Aiutoremove commented out obsoete RT_ASSERT macro occurences.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 -- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- 3 files changed, 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -2
@@ -1794,8 +1794,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */ /* Indicate packets */ -/* RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!!\n")); */ -/* indicate this recv_frame */ /* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -122,7 +122,6 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)u8 *bufferPtr = buffer; pageNums = size /MAX_DLFW_PAGE_SIZE ; -/* RT_ASSERT((pageNums <= 4), ("Page numbers should not greater then 4\n")); */ remainSize = size %MAX_DLFW_PAGE_SIZE ;for (page =0 ; page < pageNums; page++) {
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -5
@@ -226,7 +226,6 @@ static void _InitNormalChipOneOutEpPriority(struct adapter *Adapter) value =QUEUE_NORMAL ;break ;default : -/* RT_ASSERT(false, ("Shall not reach here!\n")); */ break ; }
@@ -260,7 +259,6 @@ static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter) valueLow =QUEUE_NORMAL ;break ;default : -/* RT_ASSERT(false, ("Shall not reach here!\n")); */ break ; }
@@ -325,7 +323,6 @@ static void _InitQueuePriority(struct adapter *Adapter)_InitNormalChipThreeOutEpPriority (Adapter);break ;default : -/* RT_ASSERT(false, ("Shall not reach here!\n")); */ break ; }
@@ -516,7 +513,6 @@ static void _InitOperationMode(struct adapter *padapter) regBwOpMode =BW_OPMODE_20MHZ ;break ;case WIRELESS_MODE_A : -/* RT_ASSERT(false, ("Error wireless a mode\n")); */ break ;case WIRELESS_MODE_G : regBwOpMode =BW_OPMODE_20MHZ ;
@@ -530,7 +526,6 @@ static void _InitOperationMode(struct adapter *padapter) regBwOpMode =BW_OPMODE_20MHZ ;break ;case WIRELESS_MODE_N_5G : -/* RT_ASSERT(false, ("Error wireless mode")); */ regBwOpMode =BW_OPMODE_5G ;break ;
Signature · 1 line
2.20.1
PATCH 19/43 staging: rtl8723bs: remove unused RT_PRINTK macro
In reply to Fabio Aiutoremove unused RT_PRINTK macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -2
@@ -87,8 +87,6 @@/*------------------------Export Marco Definition---------------------------*/ #define DbgPrint printk - #define RT_PRINTK(fmt, args...)\ - DbgPrint("%s(): " fmt, __func__, ## args)#define RT_DISP (dbgtype, dbgflag, printstr)void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 20/43 staging: rtl8723bs: remove BTC_PRINT logs
In reply to Fabio AiutoRemove BTC_PRINT logs.
BTC_PRINT macro's default behavoiur is _do nothing_. It's enabled by uncommenting some code in hal/hal_btcoex.c file.
So just remove it.
Applied following semantic patch:
@@
@@
- BTC_PRINT(...);
--- .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 580 +----------------- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 489 --------------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 7 - 3 files changed, 2 insertions(+), 1074 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +2 -578
@@ -41,43 +41,18 @@ static u8 halbtc8723b1ant_BtRssiState(if (btRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT )) { btRssiState =BTC_RSSI_STATE_HIGH ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to High\n" ) - ); }else { btRssiState =BTC_RSSI_STATE_STAY_LOW ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state stay at Low\n" ) - ); } }else {if (btRssi < rssiThresh) { btRssiState =BTC_RSSI_STATE_LOW ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to Low\n" ) - ); }else { btRssiState =BTC_RSSI_STATE_STAY_HIGH ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state stay at High\n" ) - ); } } }else if (levelNum ==3 ) {if (rssiThresh > rssiThresh1) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi thresh error!!\n" ) - );return pCoexSta->preBtRssiState; }
@@ -87,18 +62,8 @@ static u8 halbtc8723b1ant_BtRssiState( ) {if (btRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT )) { btRssiState =BTC_RSSI_STATE_MEDIUM ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to Medium\n" ) - ); }else { btRssiState =BTC_RSSI_STATE_STAY_LOW ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state stay at Low\n" ) - ); } } else if ( (pCoexSta->preBtRssiState == BTC_RSSI_STATE_MEDIUM) ||
@@ -106,41 +71,16 @@ static u8 halbtc8723b1ant_BtRssiState( ) {if (btRssi >= (rssiThresh1 +BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT )) { btRssiState =BTC_RSSI_STATE_HIGH ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to High\n" ) - ); }else if (btRssi < rssiThresh) { btRssiState =BTC_RSSI_STATE_LOW ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to Low\n" ) - ); }else { btRssiState =BTC_RSSI_STATE_STAY_MEDIUM ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state stay at Medium\n" ) - ); } } else {if (btRssi < rssiThresh1) { btRssiState =BTC_RSSI_STATE_MEDIUM ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state switch to Medium\n" ) - ); }else { btRssiState =BTC_RSSI_STATE_STAY_HIGH ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_BT_RSSI_STATE , - ("[BTCoex], BT Rssi state stay at High\n" ) - ); } } }
@@ -322,12 +262,6 @@ static void halbtc8723b1ant_QueryBtInfo(struct btc_coexist *pBtCoexist) H2C_Parameter[0 ] |=BIT0 ;/* trigger */ -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_EXEC , - ("[BTCoex], Query Bt Info, FW write 0x61 = 0x%x\n" , H2C_Parameter[0 ]) - ); - pBtCoexist->fBtcFillH2c (pBtCoexist,0x61 ,1 , H2C_Parameter); }
@@ -367,18 +301,6 @@ static void halbtc8723b1ant_MonitorBtCtr(struct btc_coexist *pBtCoexist)if ((pCoexSta->lowPriorityTx >=1050 ) && (!pCoexSta->bC2hBtInquiryPage)) pCoexSta->popEventCnt++; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ( -"[BTCoex], Hi-Pri Rx/Tx: %d/%d, Lo-Pri Rx/Tx: %d/%d\n" , - regHPRx, - regHPTx, - regLPRx, - regLPTx - ) - ); -/* reset counter */ pBtCoexist->fBtcWrite1Byte (pBtCoexist,0x76e ,0xc );
@@ -587,11 +509,6 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_HS_OPERATION , &bBtHsOn);if (!pBtLinkInfo->bBtLinkExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], No BT link exists!!!\n" ) - );return algorithm; }
@@ -606,41 +523,16 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)if (numOfDiffProfile ==1 ) {if (pBtLinkInfo->bScoExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO only\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_SCO ; }else {if (pBtLinkInfo->bHidExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID only\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID ; }else if (pBtLinkInfo->bA2dpExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = A2DP only\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_A2DP ; }else if (pBtLinkInfo->bPanExist) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = PAN(HS) only\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANHS ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = PAN(EDR) only\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR ; } }
@@ -648,74 +540,29 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) }else if (numOfDiffProfile ==2 ) {if (pBtLinkInfo->bScoExist) {if (pBtLinkInfo->bHidExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + HID\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID ; }else if (pBtLinkInfo->bA2dpExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + A2DP ==> SCO\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_SCO ; }else if (pBtLinkInfo->bPanExist) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + PAN(HS)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_SCO ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + PAN(EDR)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } } }else {if (pBtLinkInfo->bHidExist && pBtLinkInfo->bA2dpExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID + A2DP\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID_A2DP ; }else if (pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID + PAN(HS)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID_A2DP ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID + PAN(EDR)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } }else if (pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = A2DP + PAN(HS)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_A2DP_PANHS ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = A2DP + PAN(EDR)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_A2DP ; } }
@@ -723,32 +570,19 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) }else if (numOfDiffProfile ==3 ) {if (pBtLinkInfo->bScoExist) {if (pBtLinkInfo->bHidExist && pBtLinkInfo->bA2dpExist) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + HID + A2DP ==> HID\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID ; }else if ( pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist ) {if (bBtHsOn) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BT Profile = SCO + HID + PAN(HS)\n" )); algorithm =BT_8723B_1ANT_COEX_ALGO_HID_A2DP ; }else { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BT Profile = SCO + HID + PAN(EDR)\n" )); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } }else if (pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist) {if (bBtHsOn) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BT Profile = SCO + A2DP + PAN(HS)\n" )); algorithm =BT_8723B_1ANT_COEX_ALGO_SCO ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + A2DP + PAN(EDR) ==> HID\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } }
@@ -759,18 +593,8 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bA2dpExist ) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID + A2DP + PAN(HS)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID_A2DP ; }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = HID + A2DP + PAN(EDR)\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_HID_A2DP_PANEDR ; } }
@@ -783,18 +607,7 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bA2dpExist ) {if (bBtHsOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Error!!! BT Profile = SCO + HID + A2DP + PAN(HS)\n" ) - ); - }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT Profile = SCO + HID + A2DP + PAN(EDR) ==>PAN(EDR)+HID\n" ) - ); algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } }
@@ -820,15 +633,6 @@ static void halbtc8723b1ant_SetSwPenaltyTxRateAdaptive( H2C_Parameter[5 ] =0xf9 ;/* MCS5 or OFDM36 */ } -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_EXEC , - ( -"[BTCoex], set WiFi Low-Penalty Retry: %s" , - (bLowPenaltyRa ?"ON!!" :"OFF!!" ) - ) - ); - pBtCoexist->fBtcFillH2c (pBtCoexist,0x69 ,6 , H2C_Parameter); }
@@ -857,32 +661,12 @@ static void halbtc8723b1ant_SetCoexTable(u8 val0x6cc ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_SW_EXEC , - ("[BTCoex], set coex table, set 0x6c0 = 0x%x\n" , val0x6c0) - ); pBtCoexist->fBtcWrite4Byte (pBtCoexist,0x6c0 , val0x6c0); -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_SW_EXEC , - ("[BTCoex], set coex table, set 0x6c4 = 0x%x\n" , val0x6c4) - ); pBtCoexist->fBtcWrite4Byte (pBtCoexist,0x6c4 , val0x6c4); -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_SW_EXEC , - ("[BTCoex], set coex table, set 0x6c8 = 0x%x\n" , val0x6c8) - ); pBtCoexist->fBtcWrite4Byte (pBtCoexist,0x6c8 , val0x6c8); -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_SW_EXEC , - ("[BTCoex], set coex table, set 0x6cc = 0x%x\n" , val0x6cc) - ); pBtCoexist->fBtcWrite1Byte (pBtCoexist,0x6cc , val0x6cc); }
@@ -895,15 +679,6 @@ static void halbtc8723b1ant_CoexTable(u8 val0x6cc ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_SW , - ( -"[BTCoex], %s write Coex Table 0x6c0 = 0x%x, 0x6c4 = 0x%x, 0x6cc = 0x%x\n" , - (bForceExec ?"force to" :"" ), - val0x6c0, val0x6c4, val0x6cc - ) - ); pCoexDm->curVal0x6c0 = val0x6c0; pCoexDm->curVal0x6c4 = val0x6c4; pCoexDm->curVal0x6c8 = val0x6c8;
@@ -933,12 +708,6 @@ static void halbtc8723b1ant_CoexTableWithType( struct btc_coexist *pBtCoexist, bool bForceExec, u8 type ) { - BTC_PRINT( - BTC_MSG_ALGORITHM, - ALGO_TRACE, - ("[BTCoex], ********** CoexTable(%d) **********\n", type) - ); - pCoexSta->nCoexTableType = type;switch (type) {
@@ -996,15 +765,6 @@ static void halbtc8723b1ant_SetFwIgnoreWlanAct(if (bEnable) H2C_Parameter[0 ] |=BIT0 ;/* function enable */ -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_EXEC , - ( -"[BTCoex], set FW for BT Ignore Wlan_Act, FW write 0x63 = 0x%x\n" , - H2C_Parameter[0 ] - ) - ); - pBtCoexist->fBtcFillH2c (pBtCoexist,0x63 ,1 , H2C_Parameter); }
@@ -1012,28 +772,9 @@ static void halbtc8723b1ant_IgnoreWlanAct( struct btc_coexist *pBtCoexist, bool bForceExec, bool bEnable ) { - BTC_PRINT( - BTC_MSG_ALGORITHM, - ALGO_TRACE_FW, - ( -"[BTCoex], %s turn Ignore WlanAct %s\n" , - (bForceExec ?"force to" :"" ), - (bEnable ?"ON" :"OFF" ) - ) - ); pCoexDm->bCurIgnoreWlanAct = bEnable;if (!bForceExec) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ( -"[BTCoex], bPreIgnoreWlanAct = %d, bCurIgnoreWlanAct = %d!!\n" , - pCoexDm->bPreIgnoreWlanAct, - pCoexDm->bCurIgnoreWlanAct - ) - ); -if (pCoexDm->bPreIgnoreWlanAct == pCoexDm->bCurIgnoreWlanAct)return ; }
@@ -1057,44 +798,14 @@ static void halbtc8723b1ant_LpsRpwm( struct btc_coexist *pBtCoexist, bool bForceExec, u8 lpsVal, u8 rpwmVal ) { - BTC_PRINT( - BTC_MSG_ALGORITHM, - ALGO_TRACE_FW, - ( -"[BTCoex], %s set lps/rpwm = 0x%x/0x%x\n" , - (bForceExec ?"force to" :"" ), - lpsVal, - rpwmVal - ) - ); pCoexDm->curLps = lpsVal; pCoexDm->curRpwm = rpwmVal;if (!bForceExec) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ( -"[BTCoex], LPS-RxBeaconMode = 0x%x , LPS-RPWM = 0x%x!!\n" , - pCoexDm->curLps, - pCoexDm->curRpwm - ) - ); -if ( (pCoexDm->preLps == pCoexDm->curLps) && (pCoexDm->preRpwm == pCoexDm->curRpwm) ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ( -"[BTCoex], LPS-RPWM_Last = 0x%x , LPS-RPWM_Now = 0x%x!!\n" , - pCoexDm->preRpwm, - pCoexDm->curRpwm - ) - ); -return ; } }
@@ -1108,12 +819,6 @@ static void halbtc8723b1ant_SwMechanism( struct btc_coexist *pBtCoexist, bool bLowPenaltyRA ) { - BTC_PRINT( - BTC_MSG_ALGORITHM, - ALGO_BT_MONITOR, - ("[BTCoex], SM[LpRA] = %d\n", bLowPenaltyRA) - ); -halbtc8723b1ant_LowPenaltyRa (pBtCoexist ,NORMAL_EXEC ,bLowPenaltyRA ); }
@@ -1190,10 +895,8 @@ static void halbtc8723b1ant_SetAntPath( cntBtCalChk++;if (u1Tmp &BIT0 ) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_INIT , ("[BTCoex], ########### BT is calibrating (wait cnt =%d) ###########\n" , cntBtCalChk));mdelay (50 ); }else { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_INIT , ("[BTCoex], ********** BT is NOT calibrating (wait cnt =%d)**********\n" , cntBtCalChk));break ; } }
@@ -1318,11 +1021,6 @@ static void halbtc8723b1ant_SetFwPstdma(if (bApEnable) {if (byte1 &BIT4 && !(byte1 &BIT5 )) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], FW for 1Ant AP mode\n" ) - ); realByte1 &= ~BIT4 ; realByte1 |=BIT5 ;
@@ -1343,19 +1041,6 @@ static void halbtc8723b1ant_SetFwPstdma( pCoexDm->psTdmaPara[3 ] = byte4; pCoexDm->psTdmaPara[4 ] = realByte5; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_EXEC , - ( -"[BTCoex], PS-TDMA H2C cmd = 0x%x%08x\n" , - H2C_Parameter[0 ], - H2C_Parameter[1 ] <<24 | - H2C_Parameter[2 ] <<16 | - H2C_Parameter[3 ] <<8 | - H2C_Parameter[4 ] - ) - ); - pBtCoexist->fBtcFillH2c (pBtCoexist,0x60 ,5 , H2C_Parameter); }
@@ -1379,23 +1064,7 @@ static void halbtc8723b1ant_PsTdma( pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_BUSY , &bWifiBusy);if (pCoexDm->bCurPsTdmaOn) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ( -"[BTCoex], ********** TDMA(on, %d) **********\n" , - pCoexDm->curPsTdma - ) - ); }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ( -"[BTCoex], ********** TDMA(off, %d) **********\n" , - pCoexDm->curPsTdma - ) - ); }if (!bForceExec) {
@@ -1672,12 +1341,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) !bWifiConnected && BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi non connected-idle + BT non connected-idle!!\n" ) - ); -/* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ bCommon = true;
@@ -1685,12 +1348,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) bWifiConnected && (BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE == pCoexDm->btStatus) ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi connected + BT non connected-idle!!\n" ) - ); -/* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ bCommon = true;
@@ -1698,12 +1355,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) !bWifiConnected && (BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == pCoexDm->btStatus) ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi non connected-idle + BT connected-idle!!\n" ) - ); -/* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ bCommon = true;
@@ -1711,8 +1362,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) bWifiConnected && (BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == pCoexDm->btStatus) ) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Wifi connected + BT connected-idle!!\n" )); -/* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ bCommon = true;
@@ -1720,28 +1369,12 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) !bWifiConnected && (BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE != pCoexDm->btStatus) ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi non connected-idle + BT Busy!!\n" ) - ); - /* halbtc8723b1ant_SwMechanism(pBtCoexist, false); */ bCommon = true; } else {if (bWifiBusy) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi Connected-Busy + BT Busy!!\n" ) - ); }else { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], Wifi Connected-Idle + BT Busy!!\n" ) - ); } bCommon = false;
@@ -1759,12 +1392,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(s32 result;/* 0: no change, +1: increase WiFi duration, -1: decrease WiFi duration */ u8 retryCount =0 , btInfoExt; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW , - ("[BTCoex], TdmaDurationAdjustForAcl()\n" ) - ); - if ( (BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN == wifiStatus) || (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN == wifiStatus) ||
@@ -1791,11 +1418,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(if (!pCoexDm->bAutoTdmaAdjust) { pCoexDm->bAutoTdmaAdjust = true; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ("[BTCoex], first run TdmaDurationAdjust()!!\n" ) - );halbtc8723b1ant_PsTdma (pBtCoexist,NORMAL_EXEC , true,2 ); pCoexDm->psTdmaDuAdjType =2 ;
@@ -1833,11 +1455,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( up =0 ; dn =0 ; result =1 ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ("[BTCoex], Increase wifi duration!!\n" ) - ); } }else if (retryCount <=3 ) {/* <=3 retry in the last 2-second duration */ up--;
@@ -1860,7 +1477,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( dn =0 ; WaitCount =0 ; result =-1 ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE_FW_DETAIL , ("[BTCoex], Decrease wifi duration for retryCounter<3!!\n" )); } }else {/* retry count > 3, 只要1次 retry count > 3, 則調窄WiFi duration */ if (WaitCount ==1 )
@@ -1876,11 +1492,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( dn =0 ; WaitCount =0 ; result =-1 ; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ("[BTCoex], Decrease wifi duration for retryCounter>3!!\n" ) - ); }if (result ==-1 ) {
@@ -1918,14 +1529,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( pCoexDm->psTdmaDuAdjType =1 ; } }else {/* no change */ -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_DETAIL , - ( -"[BTCoex], ********** TDMA(on, %d) **********\n" , - pCoexDm->curPsTdma - ) - ); } if (
@@ -2271,20 +1874,9 @@ static void halbtc8723b1ant_ActionWifiConnected(struct btc_coexist *pBtCoexist)bool bScan = false, bLink = false, bRoam = false;bool bUnder4way = false, bApEnable = false; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], CoexForWifiConnect() ===>\n" ) - ); - pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_4_WAY_PROGRESS , &bUnder4way);if (bUnder4way) {halbtc8723b1ant_ActionWifiConnectedSpecialPacket (pBtCoexist); -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], CoexForWifiConnect(), return for wifi is under 4way<===\n" ) - );return ; }
@@ -2296,11 +1888,6 @@ static void halbtc8723b1ant_ActionWifiConnected(struct btc_coexist *pBtCoexist)halbtc8723b1ant_ActionWifiConnectedScan (pBtCoexist); elsehalbtc8723b1ant_ActionWifiConnectedSpecialPacket (pBtCoexist ); -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], CoexForWifiConnect(), return for wifi is under scan<===\n" ) - );return ; }
@@ -2397,47 +1984,36 @@ static void halbtc8723b1ant_RunSwCoexistMechanism(struct btc_coexist *pBtCoexist }else {switch (pCoexDm->curAlgorithm) {case BT_8723B_1ANT_COEX_ALGO_SCO : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = SCO.\n" ));/* halbtc8723b1ant_ActionSco(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_HID : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = HID.\n" ));/* halbtc8723b1ant_ActionHid(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_A2DP : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = A2DP.\n" ));/* halbtc8723b1ant_ActionA2dp(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_A2DP_PANHS : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = A2DP+PAN(HS).\n" ));/* halbtc8723b1ant_ActionA2dpPanHs(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_PANEDR : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = PAN(EDR).\n" ));/* halbtc8723b1ant_ActionPanEdr(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_PANHS : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = HS mode.\n" ));/* halbtc8723b1ant_ActionPanHs(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_PANEDR_A2DP : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = PAN+A2DP.\n" ));/* halbtc8723b1ant_ActionPanEdrA2dp(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_PANEDR_HID : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = PAN(EDR)+HID.\n" ));/* halbtc8723b1ant_ActionPanEdrHid(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_HID_A2DP_PANEDR : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = HID+A2DP+PAN.\n" ));/* halbtc8723b1ant_ActionHidA2dpPanEdr(pBtCoexist); */ break ;case BT_8723B_1ANT_COEX_ALGO_HID_A2DP : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = HID+A2DP.\n" ));/* halbtc8723b1ant_ActionHidA2dp(pBtCoexist); */ break ;default : -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Action algorithm = coexist All Off!!\n" ));break ; } pCoexDm->preAlgorithm = pCoexDm->curAlgorithm;
@@ -2454,20 +2030,15 @@ static void halbtc8723b1ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist)u32 wifiLinkStatus =0 ;u32 numOfWifiLink =0 ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], RunCoexistMechanism() ===>\n" )); -if (pBtCoexist->bManualControl) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], RunCoexistMechanism(), return for Manual CTRL <===\n" ));return ; }if (pBtCoexist->bStopCoexDm) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], RunCoexistMechanism(), return for Stop Coex DM <===\n" ));return ; }if (pCoexSta->bUnderIps) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], wifi is under IPS !!!\n" ));return ; }
@@ -2498,24 +2069,10 @@ static void halbtc8723b1ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist) numOfWifiLink = wifiLinkStatus >>16 ;if ((numOfWifiLink >=2 ) || (wifiLinkStatus &WIFI_P2P_GO_CONNECTED )) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ( -"############# [BTCoex], Multi-Port numOfWifiLink = %d, wifiLinkStatus = 0x%x\n" , - numOfWifiLink, - wifiLinkStatus - ) - );halbtc8723b1ant_LimitedTx (pBtCoexist,NORMAL_EXEC ,0 ,0 ,0 ,0 );halbtc8723b1ant_LimitedRx (pBtCoexist,NORMAL_EXEC , false, bBtCtrlAggBufSize, aggBufSize);if ((pBtLinkInfo->bA2dpExist) && (pCoexSta->bC2hBtInquiryPage)) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("############# [BTCoex], BT Is Inquirying\n" ) - );halbtc8723b1ant_ActionBtInquiry (pBtCoexist); }else halbtc8723b1ant_ActionWifiMultiPort (pBtCoexist);
@@ -2544,11 +2101,6 @@ static void halbtc8723b1ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist) pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_HS_OPERATION , &bBtHsOn);if (pCoexSta->bC2hBtInquiryPage) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("############# [BTCoex], BT Is Inquirying\n" ) - );halbtc8723b1ant_ActionBtInquiry (pBtCoexist);return ; }else if (bBtHsOn) {
@@ -2560,8 +2112,6 @@ static void halbtc8723b1ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist)if (!bWifiConnected) {bool bScan = false, bLink = false, bRoam = false; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], wifi is non connected-idle !!!\n" )); - pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_SCAN , &bScan); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_LINK , &bLink); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_ROAM , &bRoam);
@@ -2599,12 +2149,6 @@ static void halbtc8723b1ant_InitHwConfig(u32 u4Tmp =0 ;/* fwVer; */ u8 u1Tmpa =0 , u1Tmpb =0 ; -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_INIT , - ("[BTCoex], 1Ant Init HW Config!!\n" ) - ); - pBtCoexist->fBtcWrite1ByteBitMask (pBtCoexist,0x550 ,0x8 ,0x1 );/* enable TBTT nterrupt */ /* 0x790[5:0]= 0x5 */
@@ -2627,17 +2171,6 @@ static void halbtc8723b1ant_InitHwConfig( u4Tmp = pBtCoexist->fBtcRead4Byte (pBtCoexist,0x948 ); u1Tmpa = pBtCoexist->fBtcRead1Byte (pBtCoexist,0x765 ); u1Tmpb = pBtCoexist->fBtcRead1Byte (pBtCoexist,0x67 ); - -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ( -"############# [BTCoex], 0x948 = 0x%x, 0x765 = 0x%x, 0x67 = 0x%x\n" , - u4Tmp, - u1Tmpa, - u1Tmpb - ) - ); }/* */
@@ -2705,12 +2238,6 @@ void EXhalbtc8723b1ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bWifiOnvoid EXhalbtc8723b1ant_InitCoexDm (struct btc_coexist *pBtCoexist) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_INIT , - ("[BTCoex], Coex Mechanism Init!!\n" ) - ); - pBtCoexist->bStopCoexDm = false;halbtc8723b1ant_InitCoexDm (pBtCoexist);
@@ -3187,18 +2714,12 @@ void EXhalbtc8723b1ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)return ;if (BTC_IPS_ENTER == type) { -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], IPS ENTER notify\n" ) - ); pCoexSta->bUnderIps = true;halbtc8723b1ant_PsTdma (pBtCoexist,NORMAL_EXEC , false,0 );halbtc8723b1ant_CoexTableWithType (pBtCoexist,NORMAL_EXEC ,0 );halbtc8723b1ant_SetAntPath (pBtCoexist,BTC_ANT_PATH_BT , false, true); }else if (BTC_IPS_LEAVE == type) { -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], IPS LEAVE notify\n" ) - ); pCoexSta->bUnderIps = false;halbtc8723b1ant_InitHwConfig (pBtCoexist, false, false);
@@ -3213,14 +2734,8 @@ void EXhalbtc8723b1ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)return ;if (BTC_LPS_ENABLE == type) { -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], LPS ENABLE notify\n" ) - ); pCoexSta->bUnderLps = true; }else if (BTC_LPS_DISABLE == type) { -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], LPS DISABLE notify\n" ) - ); pCoexSta->bUnderLps = false; } }
@@ -3241,31 +2756,13 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)if (BTC_SCAN_START == type) { pCoexSta->bWiFiIsHighPriTask = true; -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], SCAN START notify\n" ) - );halbtc8723b1ant_PsTdma (pBtCoexist,FORCE_EXEC , false,8 );/* Force antenna setup for no scan result issue */ u4Tmp = pBtCoexist->fBtcRead4Byte (pBtCoexist,0x948 ); u1Tmpa = pBtCoexist->fBtcRead1Byte (pBtCoexist,0x765 ); u1Tmpb = pBtCoexist->fBtcRead1Byte (pBtCoexist,0x67 ); - - -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ( -"[BTCoex], 0x948 = 0x%x, 0x765 = 0x%x, 0x67 = 0x%x\n" , - u4Tmp, - u1Tmpa, - u1Tmpb - ) - ); }else { pCoexSta->bWiFiIsHighPriTask = false; -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], SCAN FINISH notify\n" ) - ); pBtCoexist->fBtcGet ( pBtCoexist, BTC_GET_U1_AP_NUM, &pCoexSta->nScanAPNum
@@ -3332,11 +2829,9 @@ void EXhalbtc8723b1ant_ConnectNotify(struct btc_coexist *pBtCoexist, u8 type)if (BTC_ASSOCIATE_START == type) { pCoexSta->bWiFiIsHighPriTask = true; -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], CONNECT START notify\n" )); pCoexDm->nArpCnt =0 ; }else { pCoexSta->bWiFiIsHighPriTask = false; -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], CONNECT FINISH notify\n" ));/* pCoexDm->nArpCnt = 0; */ }
@@ -3387,8 +2882,6 @@ void EXhalbtc8723b1ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 typereturn ;if (BTC_MEDIA_CONNECT == type) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], MEDIA connect notify\n" )); - pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_UNDER_B_MODE , &bWifiUnderBMode);/* Set CCK Tx/Rx high Pri except 11b mode */
@@ -3405,7 +2898,6 @@ void EXhalbtc8723b1ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type pCoexDm->backupRetryLimit = pBtCoexist->fBtcRead2Byte (pBtCoexist,0x42a ); pCoexDm->backupAmpduMaxTime = pBtCoexist->fBtcRead1Byte (pBtCoexist,0x456 ); }else { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], MEDIA disconnect notify\n" )); pCoexDm->nArpCnt =0 ; pBtCoexist->fBtcWrite1Byte (pBtCoexist,0x6cd ,0x0 );/* CCK Tx */
@@ -3430,15 +2922,6 @@ void EXhalbtc8723b1ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type pCoexDm->wifiChnlInfo[1 ] = H2C_Parameter[1 ]; pCoexDm->wifiChnlInfo[2 ] = H2C_Parameter[2 ]; -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE_FW_EXEC , - ( -"[BTCoex], FW write 0x66 = 0x%x\n" , - H2C_Parameter[0 ] <<16 | H2C_Parameter[1 ] <<8 | H2C_Parameter[2 ] - ) - ); - pBtCoexist->fBtcFillH2c (pBtCoexist,0x66 ,3 , H2C_Parameter); }
@@ -3463,18 +2946,7 @@ void EXhalbtc8723b1ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 ty BTC_PACKET_ARP == type ) {if (BTC_PACKET_ARP == type) { -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], special Packet ARP notify\n" ) - ); - pCoexDm->nArpCnt++; -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], ARP Packet Count = %d\n" , pCoexDm->nArpCnt) - );if (pCoexDm->nArpCnt >=10 )/* if APR PKT > 10 after connect, do not go to ActionWifiConnectedSpecialPacket(pBtCoexist) */ pCoexSta->bWiFiIsHighPriTask = false;
@@ -3482,19 +2954,9 @@ void EXhalbtc8723b1ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 ty pCoexSta->bWiFiIsHighPriTask = true; }else { pCoexSta->bWiFiIsHighPriTask = true; -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], special Packet DHCP or EAPOL notify\n" ) - ); } }else { pCoexSta->bWiFiIsHighPriTask = false; -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], special Packet [Type = %d] notify\n" , type) - ); } pCoexSta->specialPktPeriodCnt =0 ;
@@ -3546,23 +3008,14 @@ void EXhalbtc8723b1ant_BtInfoNotify( rspSource =BT_INFO_SRC_8723B_1ANT_WIFI_FW ; pCoexSta->btInfoC2hCnt[rspSource]++; -BTC_PRINT ( -BTC_MSG_INTERFACE , -INTF_NOTIFY , - ("[BTCoex], Bt info[%d], length =%d, hex data =[" , - rspSource, - length) - );for (i =0 ; i < length; i++) { pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];if (i ==1 ) btInfo = tmpBuf[i];if (i == length -1 ) -BTC_PRINT ( -BTC_MSG_INTERFACE ,INTF_NOTIFY , ("0x%02x]\n" , tmpBuf[i]) - ); + {}else -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("0x%02x, " , tmpBuf[i])); + {} }if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {
@@ -3586,18 +3039,12 @@ void EXhalbtc8723b1ant_BtInfoNotify(if (!pCoexSta->bBtTxRxMask) {/* BT into is responded by BT FW and BT RF REG 0x3C != 0x15 => Need to switch BT TRx Mask */ -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Switch BT TRx Mask since BT RF REG 0x3C != 0x15\n" )); pBtCoexist->fBtcSetBtReg (pBtCoexist,BTC_BT_REG_RF ,0x3c ,0x15 ); }/* Here we need to resend some wifi info to BT */ /* because bt is reset and loss of the info. */ if (pCoexSta->btInfoExt &BIT1 ) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT ext info bit1 check, send wifi BW&Chnl to BT!!\n" ) - ); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_CONNECTED , &bWifiConnected);if (bWifiConnected)EXhalbtc8723b1ant_MediaStatusNotify (pBtCoexist,BTC_MEDIA_CONNECT );
@@ -3607,11 +3054,6 @@ void EXhalbtc8723b1ant_BtInfoNotify(if (pCoexSta->btInfoExt &BIT3 ) {if (!pBtCoexist->bManualControl && !pBtCoexist->bStopCoexDm) { -BTC_PRINT ( -BTC_MSG_ALGORITHM , -ALGO_TRACE , - ("[BTCoex], BT ext info bit3 check, set BT NOT to ignore Wlan active!!\n" ) - );halbtc8723b1ant_IgnoreWlanAct (pBtCoexist,FORCE_EXEC , false); } }else {
@@ -3661,26 +3103,21 @@ void EXhalbtc8723b1ant_BtInfoNotify(if (!(btInfo &BT_INFO_8723B_1ANT_B_CONNECTION )) { pCoexDm->btStatus =BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BtInfoNotify(), BT Non-Connected idle!!!\n" )); }else if (btInfo ==BT_INFO_8723B_1ANT_B_CONNECTION ) {/* connection exists but no busy */ pCoexDm->btStatus =BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BtInfoNotify(), BT Connected-idle!!!\n" )); }else if ( (btInfo &BT_INFO_8723B_1ANT_B_SCO_ESCO ) || (btInfo &BT_INFO_8723B_1ANT_B_SCO_BUSY ) ) { pCoexDm->btStatus =BT_8723B_1ANT_BT_STATUS_SCO_BUSY ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BtInfoNotify(), BT SCO busy!!!\n" )); }else if (btInfo &BT_INFO_8723B_1ANT_B_ACL_BUSY ) {if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY != pCoexDm->btStatus) pCoexDm->bAutoTdmaAdjust = false; pCoexDm->btStatus =BT_8723B_1ANT_BT_STATUS_ACL_BUSY ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BtInfoNotify(), BT ACL busy!!!\n" )); }else { pCoexDm->btStatus =BT_8723B_1ANT_BT_STATUS_MAX ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], BtInfoNotify(), BT Non-Defined state!!!\n" )); } if (
@@ -3698,8 +3135,6 @@ void EXhalbtc8723b1ant_BtInfoNotify(void EXhalbtc8723b1ant_HaltNotify (struct btc_coexist *pBtCoexist) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], Halt notify\n" )); -halbtc8723b1ant_PowerSaveState (pBtCoexist,BTC_PS_WIFI_NATIVE ,0x0 ,0x0 );halbtc8723b1ant_PsTdma (pBtCoexist,FORCE_EXEC , false,0 );halbtc8723b1ant_SetAntPath (pBtCoexist,BTC_ANT_PATH_BT , false, true);
@@ -3713,11 +3148,7 @@ void EXhalbtc8723b1ant_HaltNotify(struct btc_coexist *pBtCoexist)void EXhalbtc8723b1ant_PnpNotify (struct btc_coexist *pBtCoexist,u8 pnpState) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], Pnp notify\n" )); -if (BTC_WIFI_PNP_SLEEP == pnpState) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], Pnp notify to SLEEP\n" )); -halbtc8723b1ant_PowerSaveState (pBtCoexist,BTC_PS_WIFI_NATIVE ,0x0 ,0x0 );halbtc8723b1ant_PsTdma (pBtCoexist,NORMAL_EXEC , false,0 );halbtc8723b1ant_CoexTableWithType (pBtCoexist,NORMAL_EXEC ,2 );
@@ -3725,7 +3156,6 @@ void EXhalbtc8723b1ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpState) pBtCoexist->bStopCoexDm = true; }else if (BTC_WIFI_PNP_WAKE_UP == pnpState) { -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_NOTIFY , ("[BTCoex], Pnp notify to WAKE UP\n" )); pBtCoexist->bStopCoexDm = false;halbtc8723b1ant_InitHwConfig (pBtCoexist, false, false);halbtc8723b1ant_InitCoexDm (pBtCoexist);
@@ -3738,16 +3168,10 @@ void EXhalbtc8723b1ant_Periodical(struct btc_coexist *pBtCoexist)static u8 disVerInfoCnt;u32 fwVer =0 , btPatchVer =0 ; -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], ==========================Periodical ===========================\n" )); -if (disVerInfoCnt <=5 ) { disVerInfoCnt +=1 ; -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_INIT , ("[BTCoex], ****************************************************************\n" )); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U4_BT_PATCH_VER , &btPatchVer); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U4_WIFI_FW_VER , &fwVer); -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_INIT , ("[BTCoex], CoexVer/ FwVer/ PatchVer = %d_%x/ 0x%x/ 0x%x(%d)\n" , \ - GLCoexVerDate8723b1Ant, GLCoexVer8723b1Ant, fwVer, btPatchVer, btPatchVer)); -BTC_PRINT (BTC_MSG_INTERFACE ,INTF_INIT , ("[BTCoex], ****************************************************************\n" )); }halbtc8723b1ant_MonitorBtCtr (pBtCoexist);
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +0 -489
1,164 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -7
@@ -131,9 +131,6 @@ static void halbtcoutsrc_NormalLps(struct btc_coexist *pBtCoexist) {struct adapter *padapter; - -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE , ("[BTCoex], Normal LPS behavior!!!\n" )); - padapter = pBtCoexist->Adapter;if (pBtCoexist->btInfo.bBtCtrlLps) {
@@ -1481,10 +1478,6 @@ u32 hal_btcoex_GetRaMask(struct adapter *padapter)void hal_btcoex_RecordPwrMode (struct adapter *padapter,u8 *pCmdBuf,u8 cmdLen) { -BTC_PRINT (BTC_MSG_ALGORITHM ,ALGO_TRACE_FW_EXEC , ("[BTCoex], FW write pwrModeCmd = 0x%04x%08x\n" , - pCmdBuf[0 ] <<8 | pCmdBuf[1 ], - pCmdBuf[2 ] <<24 | pCmdBuf[3 ] <<16 | pCmdBuf[4 ] <<8 | pCmdBuf[5 ])); -memcpy (GLBtCoexist.pwrModeVal, pCmdBuf, cmdLen); }
Signature · 1 line
2.20.1
PATCH 21/43 staging: rtl8723bs: remove empty if-else blocks after BTC_PRINT removal
In reply to Fabio Aiutoremove if-else blocks left empty after BTC_PRINT removal.
--- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 16 +--------------- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 12 +----------- 2 files changed, 2 insertions(+), 26 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +1 -15
@@ -606,8 +606,7 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { -if (bBtHsOn) { - }else { +if (!bBtHsOn) { algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; } }
@@ -1063,10 +1062,6 @@ static void halbtc8723b1ant_PsTdma( pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_BUSY , &bWifiBusy); -if (pCoexDm->bCurPsTdmaOn) { - }else { - } -if (!bForceExec) { if ( (pCoexDm->bPrePsTdmaOn == pCoexDm->bCurPsTdmaOn) &&
@@ -1373,10 +1368,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) bCommon = true; }else { -if (bWifiBusy) { - }else { - } - bCommon = false; }
@@ -1528,7 +1519,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(halbtc8723b1ant_PsTdma (pBtCoexist,NORMAL_EXEC , true,1 ); pCoexDm->psTdmaDuAdjType =1 ; } - }else {/* no change */ } if (
@@ -3012,10 +3002,6 @@ void EXhalbtc8723b1ant_BtInfoNotify( pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];if (i ==1 ) btInfo = tmpBuf[i]; -if (i == length -1 ) - {} -else - {} }if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +1 -11
@@ -1621,8 +1621,7 @@ static void halbtc8723b2ant_TdmaDurationAdjust(if (!bScan && !bLink && !bRoam)halbtc8723b2ant_PsTdma (pBtCoexist,NORMAL_EXEC , true, pCoexDm->psTdmaDuAdjType); -else { - } + } }
@@ -2859,10 +2858,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 typeu8 wifiCentralChnl;u8 apNum =0 ; -if (BTC_MEDIA_CONNECT == type) { - }else { - } -/* only 2.4G we need to inform bt the chnl mask */ pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U1_WIFI_CENTRAL_CHNL , &wifiCentralChnl);if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <=14 )) {
@@ -2889,8 +2884,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 typevoid EXhalbtc8723b2ant_SpecialPacketNotify (struct btc_coexist *pBtCoexist,u8 type) { -if (type ==BTC_PACKET_DHCP ) { - } } void EXhalbtc8723b2ant_BtInfoNotify(
@@ -2915,9 +2908,6 @@ void EXhalbtc8723b2ant_BtInfoNotify(if (i ==1 ) btInfo = tmpBuf[i]; -if (i == length -1 ) { - }else { - } }if (pBtCoexist->bManualControl) {
Signature · 1 line
2.20.1
PATCH 22/43 staging: rtl8723bs: remove braces around single statement in if block
In reply to Fabio Aiutofix following post-commit hook checkatch issue:
WARNING: braces {} are not necessary for single statement blocks 21: FILE: drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c:609:
+ if (!bBtHsOn) {
algorithm =
BT_8723B_1ANT_COEX_ALGO_PANEDR_HID;
}
--- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +2 -2
@@ -606,9 +606,9 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { -if (!bBtHsOn) { +if (!bBtHsOn) algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; - } + } } }
Signature · 1 line
2.20.1
PATCH 23/43 staging: rtl8723bs: remove commented out BTC_PRINT logs
In reply to Fabio Aiutoremove commented out BTC_PRINT logs.
--- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +0 -10
@@ -1055,8 +1055,6 @@ static void halbtc8723b1ant_PsTdma(s8 nWiFiDurationAdjust =0x0 ;/* u32 fwVer = 0; */ -/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW, ("[BTCoex], %s turn %s PS TDMA, type =%d\n", */ -/* (bForceExec? "force to":""), (bTurnOn? "ON":"OFF"), type)); */ pCoexDm->bCurPsTdmaOn = bTurnOn; pCoexDm->curPsTdma = type;
@@ -1423,9 +1421,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(/* acquire the BT TRx retry count from BT_Info byte2 */ retryCount = pCoexSta->btRetryCnt; btInfoExt = pCoexSta->btInfoExt; -/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW_DETAIL, ("[BTCoex], retryCount = %d\n", retryCount)); */ -/* BTC_PRINT(BTC_MSG_ALGORITHM, ALGO_TRACE_FW_DETAIL, ("[BTCoex], up =%d, dn =%d, m =%d, n =%d, WaitCount =%d\n", */ -/* up, dn, m, n, WaitCount)); */ if (pCoexSta->lowPriorityTx >1050 || pCoexSta->lowPriorityRx >1250 ) retryCount++;
@@ -2788,13 +2783,11 @@ void EXhalbtc8723b1ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type) }if (BTC_SCAN_START == type) { -/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN START notify\n")); */ if (!bWifiConnected)/* non-connected scan */ halbtc8723b1ant_ActionWifiNotConnectedScan (pBtCoexist);else /* wifi is connected */ halbtc8723b1ant_ActionWifiConnectedScan (pBtCoexist); }else if (BTC_SCAN_FINISH == type) { -/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], SCAN FINISH notify\n")); */ if (!bWifiConnected)/* non-connected scan */ halbtc8723b1ant_ActionWifiNotConnected (pBtCoexist);else
@@ -2844,11 +2837,8 @@ void EXhalbtc8723b1ant_ConnectNotify(struct btc_coexist *pBtCoexist, u8 type) }if (BTC_ASSOCIATE_START == type) { -/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT START notify\n")); */ halbtc8723b1ant_ActionWifiNotConnectedAssoAuth (pBtCoexist); }else if (BTC_ASSOCIATE_FINISH == type) { -/* BTC_PRINT(BTC_MSG_INTERFACE, INTF_NOTIFY, ("[BTCoex], CONNECT FINISH notify\n")); */ - pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_WIFI_CONNECTED , &bWifiConnected);if (!bWifiConnected)/* non-connected scan */ halbtc8723b1ant_ActionWifiNotConnected (pBtCoexist);
Signature · 1 line
2.20.1
PATCH 24/43 staging: rtl8723bs: remove BTC_PRINT macro definitions
In reply to Fabio Aiutoremove unused BTC_PRINT macro definitions.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -7
@@ -114,12 +114,6 @@ extern u32 GLBtcDbgType[];/* The following is for dbgview print */ #if DBG -#define BTC_PRINT (dbgtype, dbgflag, printstr)\ -{\ - if (GLBtcDbgType[dbgtype] & dbgflag)\ - DbgPrint printstr;\ -} -#define BTC_PRINT_ADDR (dbgtype, dbgflag, printstr, _Ptr)\ {\ if (GLBtcDbgType[dbgtype] & dbgflag) {\
@@ -149,7 +143,6 @@ extern u32 GLBtcDbgType[]; }#else -#define BTC_PRINT (dbgtype, dbgflag, printstr) no_printk printstr#define BTC_PRINT_F (dbgtype, dbgflag, printstr) no_printk printstr#define BTC_PRINT_ADDR (dbgtype, dbgflag, printstr, _Ptr) no_printk printstr#define BTC_PRINT_DATA (dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) \
Signature · 1 line
2.20.1
PATCH 25/43 staging: rtl8723bs: remove BTC_PRINT_ADDR macro definitions
In reply to Fabio Aiutoremove unused BTC_PRINT_ADDR macro definitions.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -14
@@ -114,19 +114,6 @@ extern u32 GLBtcDbgType[];/* The following is for dbgview print */ #if DBG -#define BTC_PRINT_ADDR (dbgtype, dbgflag, printstr, _Ptr)\ -{\ - if (GLBtcDbgType[dbgtype] & dbgflag) {\ - int __i;\ - u8 *ptr = (u8 *)_Ptr;\ - DbgPrint printstr;\ - DbgPrint(" ");\ - for (__i = 0; __i < 6; __i++)\ - DbgPrint("%02X%s", ptr[__i], (__i == 5) ? "" : "-");\ - DbgPrint("\n");\ - } \ -} -#define BTC_PRINT_DATA (dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\ {\ if (GLBtcDbgType[dbgtype] & dbgflag) {\
@@ -144,7 +131,6 @@ extern u32 GLBtcDbgType[];#else #define BTC_PRINT_F (dbgtype, dbgflag, printstr) no_printk printstr -#define BTC_PRINT_ADDR (dbgtype, dbgflag, printstr, _Ptr) no_printk printstr#define BTC_PRINT_DATA (dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) \ no_printk("%s %p %zu", _TitleString, _HexData, _HexDataLen)#endif
Signature · 1 line
2.20.1
PATCH 26/43 staging: rtl8723bs: remove BTC_PRINT_DATA definitions
In reply to Fabio Aiutoremove unused BTC_PRINT_DATA definitions.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 17 ----------------- 1 file changed, 17 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -17
@@ -114,25 +114,8 @@ extern u32 GLBtcDbgType[];/* The following is for dbgview print */ #if DBG -#define BTC_PRINT_DATA (dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\ -{\ - if (GLBtcDbgType[dbgtype] & dbgflag) {\ - int __i;\ - u8 *ptr = (u8 *)_HexData;\ - DbgPrint(_TitleString);\ - for (__i = 0; __i < (int)_HexDataLen; __i++) {\ - DbgPrint("%02X%s", ptr[__i], (((__i + 1) % 4) == 0) ? " " : " ");\ - if (((__i + 1) % 16) == 0)\ - DbgPrint("\n");\ - } \ - DbgPrint("\n");\ - } \ -} -#else #define BTC_PRINT_F (dbgtype, dbgflag, printstr) no_printk printstr -#define BTC_PRINT_DATA (dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) \ - no_printk("%s %p %zu", _TitleString, _HexData, _HexDataLen)#endif struct btc_board_info {
Signature · 1 line
2.20.1
PATCH 27/43 staging: rtl8723bs: remove BTC_PRINT_F macro definition
In reply to Fabio Aiutoremove unused BTC_PRINT_F macro definition.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -1
@@ -115,7 +115,6 @@ extern u32 GLBtcDbgType[];/* The following is for dbgview print */ #if DBG #else -#define BTC_PRINT_F (dbgtype, dbgflag, printstr) no_printk printstr#endif struct btc_board_info {
Signature · 1 line
2.20.1
PATCH 28/43 staging: rtl8723bs: remove empty #ifdef block
In reply to Fabio Aiutoremove empty #ifdef block.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -5
@@ -112,11 +112,6 @@ extern u32 GLBtcDbgType[];#define CL_SPRINTF snprintf#define CL_PRINTF DCMD_Printf -/* The following is for dbgview print */ -#if DBG -#else -#endif -struct btc_board_info {/* The following is some board information */ u8 btChipType;
Signature · 1 line
2.20.1
PATCH 29/43 staging: rtl8723bs: remove unsed hal_btcoex_SetDBG() function
In reply to Fabio Aiutoremove unused hal_btcoex_SetDBG() function definition and prototype.
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 12 ------------ drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 - 2 files changed, 13 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -12
@@ -1492,18 +1492,6 @@ void hal_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsizDBG_BT_INFO_INIT (pinfo,NULL ,0 ); } -void hal_btcoex_SetDBG (struct adapter *padapter,u32 *pDbgModule) -{ -u32 i; - - -if (!pDbgModule) -return ; - -for (i =0 ; i <BTC_MSG_MAX ; i++) - GLBtcDbgType[i] = pDbgModule[i]; -} -u32 hal_btcoex_GetDBG (struct adapter *padapter,u8 *pStrBuf,u32 bufSize) {s32 count;
drivers/staging/rtl8723bs/include/hal_btcoex.h +0 -1
@@ -53,7 +53,6 @@ u8 hal_btcoex_LpsVal(struct adapter *);u32 hal_btcoex_GetRaMask (struct adapter *);void hal_btcoex_RecordPwrMode (struct adapter *padapter,u8 *pCmdBuf,u8 cmdLen);void hal_btcoex_DisplayBtCoexInfo (struct adapter *,u8 *pbuf,u32 bufsize); -void hal_btcoex_SetDBG (struct adapter *,u32 *pDbgModule);u32 hal_btcoex_GetDBG (struct adapter *,u8 *pStrBuf,u32 bufSize);#endif /* !__HAL_BTCOEX_H__ */
Signature · 1 line
2.20.1
PATCH 30/43 staging: rtl8723bs: remove hal_btcoex_GetDBG() function
In reply to Fabio Aiutoremove unused hal_btcoex_GetDBG() function definition and prototype.
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 123 ------------------ .../staging/rtl8723bs/include/hal_btcoex.h | 1 - 2 files changed, 124 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -123
@@ -1492,126 +1492,3 @@ void hal_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsizDBG_BT_INFO_INIT (pinfo,NULL ,0 ); } -u32 hal_btcoex_GetDBG (struct adapter *padapter,u8 *pStrBuf,u32 bufSize) -{ -s32 count; -u8 *pstr; -u32 leftSize; - - -if (!pStrBuf || bufSize ==0 ) -return 0 ; - - pstr = pStrBuf; - leftSize = bufSize; - - count =rtw_sprintf (pstr, leftSize,"#define DBG\t%d\n" ,DBG ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - - count =rtw_sprintf (pstr, leftSize,"BTCOEX Debug Setting:\n" ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - - count =rtw_sprintf (pstr, leftSize, -"INTERFACE / ALGORITHM: 0x%08X / 0x%08X\n\n" , - GLBtcDbgType[BTC_MSG_INTERFACE ], - GLBtcDbgType[BTC_MSG_ALGORITHM ]); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - - count =rtw_sprintf (pstr, leftSize,"INTERFACE Debug Setting Definition:\n" ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[0]=%d for INTF_INIT\n" , - (GLBtcDbgType[BTC_MSG_INTERFACE ] &INTF_INIT ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[2]=%d for INTF_NOTIFY\n\n" , - (GLBtcDbgType[BTC_MSG_INTERFACE ] &INTF_NOTIFY ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - - count =rtw_sprintf (pstr, leftSize,"ALGORITHM Debug Setting Definition:\n" ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[0]=%d for BT_RSSI_STATE\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_BT_RSSI_STATE ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[1]=%d for WIFI_RSSI_STATE\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_WIFI_RSSI_STATE ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[2]=%d for BT_MONITOR\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_BT_MONITOR ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[3]=%d for TRACE\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[4]=%d for TRACE_FW\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_FW ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[5]=%d for TRACE_FW_DETAIL\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_FW_DETAIL ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[6]=%d for TRACE_FW_EXEC\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_FW_EXEC ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[7]=%d for TRACE_SW\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_SW ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[8]=%d for TRACE_SW_DETAIL\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_SW_DETAIL ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - count =rtw_sprintf (pstr, leftSize,"\tbit[9]=%d for TRACE_SW_EXEC\n" , - (GLBtcDbgType[BTC_MSG_ALGORITHM ] &ALGO_TRACE_SW_EXEC ) ?1 :0 ); -if ((count <0 ) || (count >= leftSize)) - goto exit; - pstr += count; - leftSize -= count; - -exit: - count = pstr - pStrBuf; - -return count; -}
drivers/staging/rtl8723bs/include/hal_btcoex.h +0 -1
@@ -53,6 +53,5 @@ u8 hal_btcoex_LpsVal(struct adapter *);u32 hal_btcoex_GetRaMask (struct adapter *);void hal_btcoex_RecordPwrMode (struct adapter *padapter,u8 *pCmdBuf,u8 cmdLen);void hal_btcoex_DisplayBtCoexInfo (struct adapter *,u8 *pbuf,u32 bufsize); -u32 hal_btcoex_GetDBG (struct adapter *,u8 *pStrBuf,u32 bufSize);#endif /* !__HAL_BTCOEX_H__ */
Signature · 1 line
2.20.1
PATCH 31/43 staging: rtl8723bs: remove unnecessary halbtcoutsrc_DbgInit() function
In reply to Fabio Aiutohalbtcoutsrc_DbgInit() static function was intended for manual activation of private tracing facilities.
So remove it.
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 28 ---------------------- 1 file changed, 28 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -28
@@ -75,32 +75,6 @@ static u8 halbtcoutsrc_IsBtCoexistAvailable(struct btc_coexist *pBtCoexist)return true; } -static void halbtcoutsrc_DbgInit (void ) -{ -u8 i; - -for (i =0 ; i <BTC_MSG_MAX ; i++) - GLBtcDbgType[i] =0 ; - - GLBtcDbgType[BTC_MSG_INTERFACE ] = \ -/* INTF_INIT | */ -/* INTF_NOTIFY | */ -0 ; - - GLBtcDbgType[BTC_MSG_ALGORITHM ] = \ -/* ALGO_BT_RSSI_STATE | */ -/* ALGO_WIFI_RSSI_STATE | */ -/* ALGO_BT_MONITOR | */ -/* ALGO_TRACE | */ -/* ALGO_TRACE_FW | */ -/* ALGO_TRACE_FW_DETAIL | */ -/* ALGO_TRACE_FW_EXEC | */ -/* ALGO_TRACE_SW | */ -/* ALGO_TRACE_SW_DETAIL | */ -/* ALGO_TRACE_SW_EXEC | */ -0 ; -} -static void halbtcoutsrc_LeaveLps (struct btc_coexist *pBtCoexist) {struct adapter *padapter;
@@ -919,8 +893,6 @@ void hal_btcoex_Initialize(void *padapter)/* pBtCoexist->statistics.cntBind++; */ -halbtcoutsrc_DbgInit (); - pBtCoexist->chipInterface =BTC_INTF_SDIO ;EXhalbtcoutsrc_BindBtCoexWithAdapter (padapter);
Signature · 1 line
2.20.1
PATCH 32/43 staging: rtl8723bs: remove obsolete GLBtcDbgType array declarations
In reply to Fabio Aiutoremove obsolete GLBtcDbgType declarations for it was intended for private debug facilities.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 - drivers/staging/rtl8723bs/hal/hal_btcoex.c | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -1
@@ -83,7 +83,6 @@ enum {BTC_MSG_ALGORITHM =0x1 , BTC_MSG_MAX }; -extern u32 GLBtcDbgType[];/* following is for BTC_MSG_INTERFACE */ #define INTF_INIT BIT0
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -1
@@ -17,7 +17,6 @@ struct btc_coexist GLBtCoexist;static u8 GLBtcWiFiInScanState;static u8 GLBtcWiFiInIQKState; -u32 GLBtcDbgType[BTC_MSG_MAX ];static u8 GLBtcDbgBuf[BT_TMP_BUF_SIZE ];struct btcdbginfo {/* _btcoexdbginfo */
Signature · 1 line
2.20.1
PATCH 33/43 staging: rtl8723bs: remove unused enum
In reply to Fabio Aiutoremove unused enum.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -6
@@ -78,12 +78,6 @@ enum { BTC_CHIP_MAX }; -enum { -BTC_MSG_INTERFACE =0x0 , -BTC_MSG_ALGORITHM =0x1 , -BTC_MSG_MAX -}; -/* following is for BTC_MSG_INTERFACE */ #define INTF_INIT BIT0#define INTF_NOTIFY BIT2
Signature · 1 line
2.20.1
PATCH 34/43 staging: rtl8723bs: remove obsolete debug macros
In reply to Fabio Aiutoremove obsolete debug macros.
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -16
@@ -78,22 +78,6 @@ enum { BTC_CHIP_MAX }; -/* following is for BTC_MSG_INTERFACE */ -#define INTF_INIT BIT0 -#define INTF_NOTIFY BIT2 - -/* following is for BTC_ALGORITHM */ -#define ALGO_BT_RSSI_STATE BIT0 -#define ALGO_WIFI_RSSI_STATE BIT1 -#define ALGO_BT_MONITOR BIT2 -#define ALGO_TRACE BIT3 -#define ALGO_TRACE_FW BIT4 -#define ALGO_TRACE_FW_DETAIL BIT5 -#define ALGO_TRACE_FW_EXEC BIT6 -#define ALGO_TRACE_SW BIT7 -#define ALGO_TRACE_SW_DETAIL BIT8 -#define ALGO_TRACE_SW_EXEC BIT9 -/* following is for wifi link status */ #define WIFI_STA_CONNECTED BIT0#define WIFI_AP_CONNECTED BIT1
Signature · 1 line
2.20.1
PATCH 35/43 staging: rtl8723bs: remove commented out DbgPrint logs
In reply to Fabio Aiutoremove commented out DbgPrint logs.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 1 - drivers/staging/rtl8723bs/core/rtw_recv.c | 20 ------------------- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 1 - drivers/staging/rtl8723bs/hal/odm_DIG.c | 1 - drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 12 ----------- drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 -- 7 files changed, 38 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +0 -1
@@ -38,7 +38,6 @@ Efuse_Read1ByteFromFakeContent( {if (Offset >=EFUSE_MAX_HW_SIZE )return false; -/* DbgPrint("Read fake content, offset = %d\n", Offset); */ if (fakeEfuseBank ==0 ) *Value = fakeEfuseContent[Offset];else
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -20
@@ -1644,16 +1644,10 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n/* Rx Reorder initialize condition. */ if (preorder_ctrl->indicate_seq ==0xFFFF ) { preorder_ctrl->indicate_seq = seq_num; - -/* DbgPrint("check_indicate_seq, 1st->indicate_seq =%d\n", precvpriv->indicate_seq); */ } -/* DbgPrint("enter->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ -/* Drop out the packet which SeqNum is smaller than WinStart */ if (SN_LESS (seq_num, preorder_ctrl->indicate_seq)) { -/* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ -return false; }
@@ -1666,8 +1660,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq +1 ) &0xFFF ; }else if (SN_LESS (wend, seq_num)) { -/* DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ -/* boundary situation, when seq_num cross 0xFFF */ if (seq_num >= (wsize -1 )) preorder_ctrl->indicate_seq = seq_num +1 - wsize;
@@ -1676,8 +1668,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n pdbgpriv->dbg_rx_ampdu_window_shift_cnt++; } -/* DbgPrint("exit->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */ -return true; }
@@ -1689,8 +1679,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, ununion recv_frame *pnextrframe;struct rx_pkt_attrib *pnextattrib; -/* DbgPrint("+enqueue_reorder_recvframe()\n"); */ -/* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */ /* spin_lock(&ppending_recvframe_queue->lock); */
@@ -1711,8 +1699,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, unelse break ; -/* DbgPrint("enqueue_reorder_recvframe():while\n"); */ - }
@@ -1751,8 +1737,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorstruct dvobj_priv *psdpriv = padapter->dvobj;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; -/* DbgPrint("+recv_indicatepkts_in_order\n"); */ -/* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */ /* spin_lock(&ppending_recvframe_queue->lock); */
@@ -1796,7 +1780,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* Indicate packets */ /* indicate this recv_frame */ -/* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */ if (!pattrib->amsdu) {if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false))
@@ -1819,8 +1802,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorbreak ; } -/* DbgPrint("recv_indicatepkts_in_order():while\n"); */ - }/* spin_unlock(&ppending_recvframe_queue->lock); */
@@ -1890,7 +1871,6 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame */* s3. Insert all packet into Reorder Queue to maintain its ordering. */ if (!enqueue_reorder_recvframe (preorder_ctrl, prframe)) { -/* DbgPrint("recv_indicatepkt_reorder, enqueue_reorder_recvframe fail!\n"); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ /* return _FAIL; */ goto _err_exit;
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +0 -1
@@ -1756,7 +1756,6 @@ static void halbtc8723b2ant_ActionA2dp(struct btc_coexist *pBtCoexist)/* define the office environment */ if (apNum >=10 &&BTC_RSSI_HIGH (wifiRssiState1)) { -/* DbgPrint(" AP#>10(%d)\n", apNum); */ pBtCoexist->fBtcSetRfReg (pBtCoexist,BTC_RF_A ,0x1 ,0xfffff ,0x0 );halbtc8723b2ant_LimitedRx (pBtCoexist,NORMAL_EXEC , false, false,0x8 );halbtc8723b2ant_FwDacSwingLvl (pBtCoexist,NORMAL_EXEC ,6 );
drivers/staging/rtl8723bs/hal/odm_DIG.c +0 -1
@@ -152,7 +152,6 @@ void odm_SearchPwdBLowerBound(void *pDM_VOID, u8 IGI_target)else pDM_Odm->txEdcca0 = pDM_Odm->txEdcca0 +1 ; } -/* DbgPrint("txEdcca1 = %d, txEdcca0 = %d\n", pDM_Odm->txEdcca1, pDM_Odm->txEdcca0); */ if (pDM_Odm->txEdcca1 >5 ) {IGI =IGI -1 ;
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +0 -12
@@ -59,7 +59,6 @@ static u8 odm_EVMdbToPercentage(s8 Value) ret_val = Value; ret_val /=2 ; -/* DbgPrint("Value =%d\n", Value); */ /* ODM_RT_DISP(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value =%d / %x\n", ret_val, ret_val)); */ if (ret_val >=0 )
@@ -141,7 +140,6 @@ static void odm_RxPhyStatus92CSeries_Parsing( } -/* DbgPrint("cck SQ = %d\n", SQ); */ pPhyInfo->signal_quality =SQ ; pPhyInfo->rx_mimo_signal_quality[ODM_RF_PATH_A ] =SQ ; pPhyInfo->rx_mimo_signal_quality[ODM_RF_PATH_B ] =-1 ;
@@ -231,9 +229,6 @@ static void odm_RxPhyStatus92CSeries_Parsing( pPhyInfo->signal_strength = (u8)(odm_SignalScaleMapping (pDM_Odm, total_rssi /= rf_rx_num)); } } - -/* DbgPrint("isCCKrate = %d, pPhyInfo->rx_pwd_ba11 = %d, pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a = 0x%x\n", */ -/* isCCKrate, pPhyInfo->rx_pwd_ba11, pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a); */ } static void odm_Process_RSSIForDM(
@@ -285,8 +280,6 @@ static void odm_Process_RSSIForDM( pDM_Odm->RSSI_A = pPhyInfo->rx_mimo_signal_strength[ODM_RF_PATH_A ]; pDM_Odm->RSSI_B =0 ; }else { -/* DbgPrint("pRfd->Status.rx_mimo_signal_strength[0] = %d, pRfd->Status.rx_mimo_signal_strength[1] = %d\n", */ -/* pRfd->Status.rx_mimo_signal_strength[0], pRfd->Status.rx_mimo_signal_strength[1]); */ pDM_Odm->RSSI_A = pPhyInfo->rx_mimo_signal_strength[ODM_RF_PATH_A ]; pDM_Odm->RSSI_B = pPhyInfo->rx_mimo_signal_strength[ODM_RF_PATH_B ];
@@ -376,11 +369,6 @@ static void odm_Process_RSSIForDM( pEntry->rssi_stat.UndecoratedSmoothedCCK = UndecoratedSmoothedCCK; pEntry->rssi_stat.UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM; pEntry->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; - -/* DbgPrint("OFDM_pkt =%d, Weighting =%d\n", OFDM_pkt, Weighting); */ -/* DbgPrint("UndecoratedSmoothedOFDM =%d, UndecoratedSmoothedPWDB =%d, UndecoratedSmoothedCCK =%d\n", */ -/* UndecoratedSmoothedOFDM, UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK); */ - } }
drivers/staging/rtl8723bs/hal/odm_RTL8723B.c +0 -1
@@ -29,7 +29,6 @@ s8 odm_CCKRSSI_8723B(u8 LNA_idx, u8 VGA_idx)break ;default :/* rx_pwr_all = -53+(2*(31-VGA_idx)); */ -/* DbgPrint("wrong LNA index\n"); */ break ; }
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -2
@@ -791,8 +791,6 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitHalDm (padapter); -/* DbgPrint("pHalData->DefaultTxPwrDbm = %d\n", pHalData->DefaultTxPwrDbm); */ -/* */ /* Update current Tx FIFO page status. */ /* */
Signature · 1 line
2.20.1
PATCH 36/43 staging: rtl8723bs: remove unused DbgPrint macro
In reply to Fabio Aiutoremove unused DbgPrint macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -1
@@ -86,7 +86,6 @@#define ODM_COMP_INIT BIT31/*------------------------Export Marco Definition---------------------------*/ -#define DbgPrint printk#define RT_DISP (dbgtype, dbgflag, printstr)void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);
Signature · 1 line
2.20.1
PATCH 37/43 staging: rtl8723bs: remove commented out *RT_DISP logs
In reply to Fabio Aiutoremove commented out ODM_RT_DISP and RT_DISP logs.
--- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 7 ------- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- 2 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +0 -7
@@ -59,8 +59,6 @@ static u8 odm_EVMdbToPercentage(s8 Value) ret_val = Value; ret_val /=2 ; -/* ODM_RT_DISP(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value =%d / %x\n", ret_val, ret_val)); */ -if (ret_val >=0 ) ret_val =0 ;if (ret_val <=-33 )
@@ -166,7 +164,6 @@ static void odm_RxPhyStatus92CSeries_Parsing(/* Translate DBM to percentage. */ RSSI =odm_QueryRxPwrPercentage (rx_pwr[i]); total_rssi +=RSSI ; -/* RT_DISP(FRX, RX_PHY_SS, ("RF-%d RXPWR =%x RSSI =%d\n", i, rx_pwr[i], RSSI)); */ pPhyInfo->rx_mimo_signal_strength[i] = (u8 )RSSI ;
@@ -181,7 +178,6 @@ static void odm_RxPhyStatus92CSeries_Parsing( rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >>1 )&0x7f )-110 ;PWDB_ALL_BT =PWDB_ALL =odm_QueryRxPwrPercentage (rx_pwr_all); -/* RT_DISP(FRX, RX_PHY_SS, ("PWDB_ALL =%d\n", PWDB_ALL)); */ pPhyInfo->rx_pwd_ba11 =PWDB_ALL ; pPhyInfo->bt_rx_rssi_percentage =PWDB_ALL_BT ;
@@ -203,9 +199,6 @@ static void odm_RxPhyStatus92CSeries_Parsing(/* value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore. */ EVM =odm_EVMdbToPercentage ((pPhyStaRpt->stream_rxevm[i]));/* dbm */ -/* RT_DISP(FRX, RX_PHY_SQ, ("RXRATE =%x RXEVM =%x EVM =%s%d\n", */ -/* GET_RX_STATUS_DESC_RX_MCS(pDesc), pDrvInfo->rxevm[i], "%", EVM)); */ -/* if (pPktinfo->bPacketMatchBSSID) */ {if (i ==ODM_RF_PATH_A )/* Fill value in RFD, Get the first spatial stream only */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1148,10 +1148,8 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest) retU2 = ((bank-1 )*EFUSE_BT_REAL_BANK_CONTENT_LEN )+efuse_addr;if (bPseudoTest) { pEfuseHal->fakeBTEfuseUsedBytes = retU2; -/* RT_DISP(FEEPROM, EFUSE_PG, ("Hal_EfuseGetCurrentSize_BT92C(), already use %u bytes\n", pEfuseHal->fakeBTEfuseUsedBytes)); */ }else { pEfuseHal->BTEfuseUsedBytes = retU2; -/* RT_DISP(FEEPROM, EFUSE_PG, ("Hal_EfuseGetCurrentSize_BT92C(), already use %u bytes\n", pEfuseHal->BTEfuseUsedBytes)); */ }return retU2;
Signature · 1 line
2.20.1
PATCH 38/43 staging: rtl8723bs: remove RT_DISP macro definition
In reply to Fabio Aiutoremove unused RT_DISP macro definition.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -3
@@ -85,9 +85,6 @@#define ODM_COMP_COMMON BIT30#define ODM_COMP_INIT BIT31 -/*------------------------Export Marco Definition---------------------------*/ -#define RT_DISP (dbgtype, dbgflag, printstr) -void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm);#endif /* __ODM_DBG_H__ */
Signature · 1 line
2.20.1
PATCH 39/43 staging: rtl8723bs: remove ODM_InitDebugSetting() function
In reply to Fabio Aiutoremove ODM_InitDebugSetting() function. It was
intended to initialize removed private debug
system. So remove it.
--- drivers/staging/rtl8723bs/hal/odm.c | 2 -- drivers/staging/rtl8723bs/hal/odm_debug.c | 35 ----------------------- drivers/staging/rtl8723bs/hal/odm_debug.h | 2 -- 3 files changed, 39 deletions(-)
drivers/staging/rtl8723bs/hal/odm.c +0 -2
@@ -290,8 +290,6 @@ static void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm) pDM_Odm->bCckHighPower = (bool )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (CCK_RPT_FORMAT , pDM_Odm),ODM_BIT (CCK_RPT_FORMAT , pDM_Odm)); pDM_Odm->RFPathRxEnable = (u8 )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (BB_RX_PATH , pDM_Odm),ODM_BIT (BB_RX_PATH , pDM_Odm)); -ODM_InitDebugSetting (pDM_Odm); - pDM_Odm->TxRate =0xFF ; }
drivers/staging/rtl8723bs/hal/odm_debug.c +0 -35
@@ -7,38 +7,3 @@#include "odm_precomp.h" -void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm) -{ - pDM_Odm->DebugLevel =ODM_DBG_LOUD ; - - pDM_Odm->DebugComponents = -/* BB Functions */ -/* ODM_COMP_DIG | */ -/* ODM_COMP_RA_MASK | */ -/* ODM_COMP_DYNAMIC_TXPWR | */ -/* ODM_COMP_FA_CNT | */ -/* ODM_COMP_RSSI_MONITOR | */ -/* ODM_COMP_CCK_PD | */ -/* ODM_COMP_ANT_DIV | */ -/* ODM_COMP_PWR_SAVE | */ -/* ODM_COMP_PWR_TRAIN | */ -/* ODM_COMP_RATE_ADAPTIVE | */ -/* ODM_COMP_PATH_DIV | */ -/* ODM_COMP_DYNAMIC_PRICCA | */ -/* ODM_COMP_RXHP | */ -/* ODM_COMP_MP | */ -/* ODM_COMP_CFO_TRACKING | */ - -/* MAC Functions */ -/* ODM_COMP_EDCA_TURBO | */ -/* ODM_COMP_EARLY_MODE | */ -/* RF Functions */ -/* ODM_COMP_TX_PWR_TRACK | */ -/* ODM_COMP_RX_GAIN_TRACK | */ -/* ODM_COMP_CALIBRATION | */ -/* Common */ -/* ODM_COMP_COMMON | */ -/* ODM_COMP_INIT | */ -/* ODM_COMP_PSD | */ -0 ; -}
drivers/staging/rtl8723bs/hal/odm_debug.h +0 -2
@@ -85,6 +85,4 @@#define ODM_COMP_COMMON BIT30#define ODM_COMP_INIT BIT31 -void ODM_InitDebugSetting (struct dm_odm_t *pDM_Odm); -#endif /* __ODM_DBG_H__ */
Signature · 1 line
2.20.1
PATCH 40/43 staging: rtl8723bs: remove empty file
In reply to Fabio Aiutoremove file left empty after function deletion.
--- drivers/staging/rtl8723bs/hal/odm_debug.c | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c
drivers/staging/rtl8723bs/hal/odm_debug.c deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -******************************************************************************/ - -#include "odm_precomp.h" -
Signature · 1 line
2.20.1
PATCH 41/43 staging: rtl8723bs: remove member in dm_odm_t struct
In reply to Fabio Aiutoremove DebugComponent in dm_odm_t struct,
remove private debug component tracing.
--- drivers/staging/rtl8723bs/hal/hal_com.c | 10 ---------- drivers/staging/rtl8723bs/hal/odm.c | 4 ---- drivers/staging/rtl8723bs/hal/odm.h | 1 - 3 files changed, 15 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +0 -10
@@ -1093,13 +1093,6 @@ u8 SetHalDefVar(u8 bResult = _SUCCESS;switch (variable) { -case HW_DEF_FA_CNT_DUMP : -/* ODM_COMP_COMMON */ -if (*((u8 *)value)) - odm->DebugComponents |= (ODM_COMP_DIG |ODM_COMP_FA_CNT ); -else - odm->DebugComponents &= ~(ODM_COMP_DIG |ODM_COMP_FA_CNT ); -break ;case HAL_DEF_DBG_RX_INFO_DUMP :if (odm->bLinked) {
@@ -1183,9 +1176,6 @@ u8 GetHalDefVar( *((int *)value) = psta->rssi_stat.UndecoratedSmoothedPWDB; }break ; -case HW_DEF_ODM_DBG_FLAG : - *((u64 *)value) = odm->DebugComponents; -break ;case HW_DEF_ODM_DBG_LEVEL : *((u32 *)value) = odm->DebugLevel;break ;
drivers/staging/rtl8723bs/hal/odm.c +0 -4
@@ -1172,10 +1172,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value) pDM_Odm->RSSI_Min = (u8 )Value;break ; -case ODM_CMNINFO_DBG_COMP : - pDM_Odm->DebugComponents = Value; -break ; -case ODM_CMNINFO_DBG_LEVEL : pDM_Odm->DebugLevel = (u32 )Value;break ;
drivers/staging/rtl8723bs/hal/odm.h +0 -1
@@ -709,7 +709,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */enum phy_reg_pg_type PhyRegPgValueType;u8 PhyRegPgVersion; -u64 DebugComponents;u32 DebugLevel;u32 NumQryPhyStatusAll;/* CCK + OFDM */
Signature · 1 line
2.20.1
PATCH 42/43 staging: rtl8723bs: remove DebugLevel member in dm_odm_t struct
In reply to Fabio Aiutoremove DebugLevel in dm_odm_t struct,
remove private debug level tracing.
remove unused variable as well to suppress compiler warning.
--- drivers/staging/rtl8723bs/hal/hal_com.c | 4 ---- drivers/staging/rtl8723bs/hal/odm.c | 3 --- drivers/staging/rtl8723bs/hal/odm.h | 2 -- 3 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +0 -4
@@ -1159,7 +1159,6 @@ u8 GetHalDefVar( ) {struct hal_com_data *hal_data =GET_HAL_DATA (adapter); -struct dm_odm_t *odm = &(hal_data->odmpriv);u8 bResult = _SUCCESS;switch (variable) {
@@ -1176,9 +1175,6 @@ u8 GetHalDefVar( *((int *)value) = psta->rssi_stat.UndecoratedSmoothedPWDB; }break ; -case HW_DEF_ODM_DBG_LEVEL : - *((u32 *)value) = odm->DebugLevel; -break ;case HAL_DEF_DBG_DM_FUNC : *((u32 *)value) = hal_data->odmpriv.SupportAbility;break ;
drivers/staging/rtl8723bs/hal/odm.c +0 -3
@@ -1172,9 +1172,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value) pDM_Odm->RSSI_Min = (u8 )Value;break ; -case ODM_CMNINFO_DBG_LEVEL : - pDM_Odm->DebugLevel = (u32 )Value; -break ;case ODM_CMNINFO_RA_THRESHOLD_HIGH : pDM_Odm->RateAdaptive.HighRSSIThresh = (u8 )Value;break ;
drivers/staging/rtl8723bs/hal/odm.h +0 -2
@@ -709,8 +709,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */enum phy_reg_pg_type PhyRegPgValueType;u8 PhyRegPgVersion; -u32 DebugLevel; -u32 NumQryPhyStatusAll;/* CCK + OFDM */ u32 LastNumQryPhyStatusAll;u32 RxPWDBAve;
Signature · 1 line
2.20.1
PATCH 43/43 staging: rtl8723bs: remove odm_debug.h header file
In reply to Fabio Aiutoremove obsolete odm_debug.h header file.
--- drivers/staging/rtl8723bs/hal/odm_debug.h | 88 --------------------- drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - 2 files changed, 89 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h
drivers/staging/rtl8723bs/hal/odm_debug.h deleted +0 -88
@@ -1,88 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -******************************************************************************/ - -#ifndef __ODM_DBG_H__ -#define __ODM_DBG_H__ - - -/* */ -/* Define the debug levels */ -/* */ -/* 1. DBG_TRACE and DBG_LOUD are used for normal cases. */ -/* So that, they can help SW engineer to developed or trace states changed */ -/* and also help HW enginner to trace every operation to and from HW, */ -/* e.g IO, Tx, Rx. */ -/* */ -/* 2. DBG_WARNNING and DBG_SERIOUS are used for unusual or error cases, */ -/* which help us to debug SW or HW. */ -/* */ -/* */ -/* */ -/* Never used in a call to ODM_RT_TRACE()! */ -/* */ -#define ODM_DBG_OFF 1 - -/* */ -/* Fatal bug. */ -/* For example, Tx/Rx/IO locked up, OS hangs, memory access violation, */ -/* resource allocation failed, unexpected HW behavior, HW BUG and so on. */ -/* */ -#define ODM_DBG_SERIOUS 2 - -/* */ -/* Abnormal, rare, or unexpected cases. */ -/* For example, */ -/* IRP/Packet/OID canceled, */ -/* device suprisely unremoved and so on. */ -/* */ -#define ODM_DBG_WARNING 3 - -/* */ -/* Normal case with useful information about current SW or HW state. */ -/* For example, Tx/Rx descriptor to fill, Tx/Rx descriptor completed status, */ -/* SW protocol state change, dynamic mechanism state change and so on. */ -/* */ -#define ODM_DBG_LOUD 4 - -/* */ -/* Normal case with detail execution flow or information. */ -/* */ -#define ODM_DBG_TRACE 5 - -/* */ -/* Define the tracing components */ -/* */ -/* */ -/* BB Functions */ -#define ODM_COMP_DIG BIT0 -#define ODM_COMP_RA_MASK BIT1 -#define ODM_COMP_DYNAMIC_TXPWR BIT2 -#define ODM_COMP_FA_CNT BIT3 -#define ODM_COMP_RSSI_MONITOR BIT4 -#define ODM_COMP_CCK_PD BIT5 -#define ODM_COMP_ANT_DIV BIT6 -#define ODM_COMP_PWR_SAVE BIT7 -#define ODM_COMP_PWR_TRAIN BIT8 -#define ODM_COMP_RATE_ADAPTIVE BIT9 -#define ODM_COMP_PATH_DIV BIT10 -#define ODM_COMP_PSD BIT11 -#define ODM_COMP_DYNAMIC_PRICCA BIT12 -#define ODM_COMP_RXHP BIT13 -#define ODM_COMP_MP BIT14 -#define ODM_COMP_CFO_TRACKING BIT15 -/* MAC Functions */ -#define ODM_COMP_EDCA_TURBO BIT16 -#define ODM_COMP_EARLY_MODE BIT17 -/* RF Functions */ -#define ODM_COMP_TX_PWR_TRACK BIT24 -#define ODM_COMP_RX_GAIN_TRACK BIT25 -#define ODM_COMP_CALIBRATION BIT26 -/* Common Functions */ -#define ODM_COMP_COMMON BIT30 -#define ODM_COMP_INIT BIT31 - -#endif /* __ODM_DBG_H__ */
drivers/staging/rtl8723bs/hal/odm_precomp.h +0 -1
@@ -27,7 +27,6 @@#include "odm.h" #include "odm_HWConfig.h" -#include "odm_debug.h" #include "odm_RegDefine11N.h" #include "odm_EdcaTurboCheck.h" #include "odm_DIG.h"
Signature · 1 line
2.20.1
kernel test robot
build botRe: [PATCH 04/43] staging: rtl8723bs: remove empty .c source file
In reply to Fabio AiutoThank you for the patch! Yet something to improve:
Hi Fabio,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/0day-ci/linux/commits/Fabio-Aiuto/staging-rtl8723bs-clean-up-driver-from-private-debug-facilities/20210430-154851 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 22e1eae2e1278f7d037c7d764d9e507e3a02a84d config: x86_64-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/da57b899c771248092dfa07886343df0c0cfe7f0 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Fabio-Aiuto/staging-rtl8723bs-clean-up-driver-from-private-debug-facilities/20210430-154851 git checkout da57b899c771248092dfa07886343df0c0cfe7f0 # save the attached .config to linux build tree make W=1 W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> make[3]: *** No rule to make target 'drivers/staging/rtl8723bs/hal/odm_PathDiv.o', needed by 'drivers/staging/rtl8723bs/r8723bs.o'.
make[3]: Target '__build' not remade because of errors.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 02/43] staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion
In reply to Fabio AiutoQuoted 5 lines · Fabio Aiuto
remove if-else blocks left empty by
ODM_RT_TRACEdeletion. remove unused variables to suppress compiler warnings.Signed-off-by Fabio Aiuto <[email protected]>
Hi Fabio!
I just wanted to point out a spelling mistake in the title 'rlt8723bs' in the off chance you submit a v2.
Way to go switching this over to netdev btw.
--
~Bryan
Re: [PATCH 02/43] staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion
Quoted 7 lines · Bryan Brattlof
Quoted 5 lines · Fabio Aiuto
remove if-else blocks left empty by
ODM_RT_TRACEdeletion. remove unused variables to suppress compiler warnings.Signed-off-by Fabio Aiuto <[email protected]>
Quoted 6 lines
Hi Fabio!
I just wanted to point out a spelling mistake in the title 'rlt8723bs' in the off chance you submit a v2.
Way to go switching this over to netdev btw.
what do you mean exactly?
Quoted 3 lines
--
~Bryan
Hi Brian,
thank you! Ouch I've just sent a v2 for other issues... no problem I will send a v3, sorry all for spamming.
fabio
kernel test robot
build botRe: [PATCH 40/43] staging: rtl8723bs: remove empty file
In reply to Fabio AiutoThank you for the patch! Yet something to improve:
Hi Fabio,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/0day-ci/linux/commits/Fabio-Aiuto/staging-rtl8723bs-clean-up-driver-from-private-debug-facilities/20210430-154851 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 22e1eae2e1278f7d037c7d764d9e507e3a02a84d config: x86_64-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/fbf0245fba22db8a03599e25fc20e2dbc4397586 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Fabio-Aiuto/staging-rtl8723bs-clean-up-driver-from-private-debug-facilities/20210430-154851 git checkout fbf0245fba22db8a03599e25fc20e2dbc4397586 # save the attached .config to linux build tree make W=1 W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> make[4]: *** No rule to make target 'drivers/staging/rtl8723bs/hal/odm_debug.o', needed by 'drivers/staging/rtl8723bs/r8723bs.o'.
make[4]: Target '__build' not remade because of errors.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 02/43] staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion
In reply to Fabio AiutoQuoted 8 lines · Fabio Aiuto
Quoted 7 lines · Bryan Brattlof
Quoted 5 lines · Fabio Aiuto
remove if-else blocks left empty by
ODM_RT_TRACEdeletion. remove unused variables to suppress compiler warnings.Signed-off-by Fabio Aiuto <[email protected]>
Quoted 9 lines
Quoted 6 lines
Hi Fabio!
I just wanted to point out a spelling mistake in the title 'rlt8723bs' in the off chance you submit a v2.
Way to go switching this over to netdev btw.
what do you mean exactly?
I was just praising you for all the work you are putting into this driver. :)
Quoted 10 lines
Quoted 4 lines
--
~BryanHi Brian,
thank you! Ouch I've just sent a v2 for other issues... no problem I will send a v3, sorry all for spamming.
Don't worry about me. I would wait until Greg and others have feedback on your v2 before sending a v3 with this minor nitpick.
--
~Bryan
Re: [PATCH 02/43] staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion
Quoted 14 lines · Bryan Brattlof
Quoted 13 lines · Fabio Aiuto
Quoted 12 lines · Bryan Brattlof
Quoted 5 lines · Fabio Aiuto
remove if-else blocks left empty by
ODM_RT_TRACEdeletion. remove unused variables to suppress compiler warnings.Signed-off-by Fabio Aiuto <[email protected]>Hi Fabio!
I just wanted to point out a spelling mistake in the title 'rlt8723bs' in the off chance you submit a v2.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Way to go switching this over to netdev btw.
what do you mean exactly?
I was just praising you for all the work you are putting into this driver. :)
thank you Bryan, I'm not to praise for my english :-D
Quoted 12 lines
Quoted 11 lines
Quoted 5 lines
--
~BryanHi Brian,
thank you! Ouch I've just sent a v2 for other issues... no problem I will send a v3, sorry all for spamming.
Quoted 6 lines
Don't worry about me. I would wait until Greg and others have feedback on your v2 before sending a v3 with this minor nitpick.
--
~Bryan
too late, v3 submitted:(. But I understand what you say and agreed. So let's wait a little more next time.
thank you,
fabio.