staging: rtl8723bs: hal: fix whitespace in sdio_halinit.c
PATCH 1/9 staging: rtl8723bs: hal: fix whitespace in sdio_halinit.c
Remove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +27 -27
@@ -46,7 +46,7 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ +/* u8 bMacPwrCtrlOn; */ /* all of these MUST be configured before power on */
@@ -70,8 +70,8 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)rtw_write16 (padapter,REG_APS_FSMCO , value16);/* Enable CMD53 R/W Operation */ -/* bMacPwrCtrlOn = true; */ -/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ +/* bMacPwrCtrlOn = true; */ +/* rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); */ rtw_write8 (padapter,REG_CR ,0x00 );/* Enable MAC DMA/WMAC/SCHEDULE/SEC block */
@@ -359,7 +359,7 @@ static void _InitNetworkType(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_CR );/* TODO: use the other function to set network type */ -/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ +/* value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );rtw_write32 (padapter,REG_CR , value32);
@@ -487,7 +487,7 @@ static void _initSdioAggregationSetting(struct adapter *padapter)struct hal_com_data *pHalData =GET_HAL_DATA (padapter);/* Tx aggregation setting */ -/* sdio_AggSettingTxUpdate(padapter); */ +/* sdio_AggSettingTxUpdate(padapter); */ /* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);
@@ -641,7 +641,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) }/* Disable Interrupt first. */ -/* rtw_hal_disable_interrupt(padapter); */ +/* rtw_hal_disable_interrupt(padapter); */ ret =_InitPowerOn_8723BS (padapter);if (ret == _FAIL)
@@ -661,7 +661,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)rtl8723b_InitializeFirmwareVars (padapter); -/* SIC_Init(padapter); */ +/* SIC_Init(padapter); */ if (pwrctrlpriv->reg_rfoff) pwrctrlpriv->rf_pwrstate = rf_off;
@@ -747,8 +747,8 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* Record original value for template. This is arough data, we can only use the data */ /* for power adjust. The value can not be adjustde according to different power!!! */ -/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ -/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ +/* pHalData->OriginalCckTxPwrIdx = pHalData->CurrentCckTxPwrIdx; */ +/* pHalData->OriginalOfdm24GTxPwrIdx = pHalData->CurrentOfdm24GTxPwrIdx; */ rtl8723b_InitAntenna_Selection (padapter);
@@ -791,7 +791,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* ack for xmit mgmt frames. */ rtw_write32 (padapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (padapter,REG_FWHW_TXQ_CTRL ) |BIT (12 )); -/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ +/* pHalData->PreRpwmVal = SdioLocalCmd52Read1Byte(padapter, SDIO_REG_HRPWM1) & 0x80; */ { pwrctrlpriv->rf_pwrstate = rf_on;
@@ -844,7 +844,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* */ /* Description: */ -/* RTL8723e card disable power sequence v003 which suggested by Scott. */ +/* RTL8723e card disable power sequence v003 which suggested by Scott. */ /* */ /* First created by tynli. 2011.01.28. */ /* */
@@ -856,7 +856,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)/* Run LPS WL RFOFF flow */ HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_enter_lps_flow); -/* ==== Reset digital sequence ====== */ +/* ==== Reset digital sequence ====== */ val =rtw_read8 (padapter,REG_MCUFWDL );if ((val &RAM_DL_SEL ) && padapter->bFWReady)/* 8051 RAM code */
@@ -879,7 +879,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter) val |=BIT (0 );rtw_write8 (padapter,REG_RSV_CTRL +1 , val); -/* ==== Reset digital sequence end ====== */ +/* ==== Reset digital sequence end ====== */ bMacPwrCtrlOn = false;/* Disable CMD53 R/W */ rtw_hal_set_hwreg (padapter,HW_VAR_APFM_ON_MAC , &bMacPwrCtrlOn);
@@ -981,13 +981,13 @@ void rtl8723bs_interface_configure(struct adapter *padapter) }/* */ -/* Description: */ -/* We should set Efuse cell selection to WiFi cell in default. */ +/* Description: */ +/* We should set Efuse cell selection to WiFi cell in default. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL */ +/* Assumption: */ +/* PASSIVE_LEVEL */ /* */ -/* Added by Roger, 2010.11.23. */ +/* Added by Roger, 2010.11.23. */ /* */ static void _EfuseCellSel (struct adapter *padapter) {
@@ -1073,24 +1073,24 @@ static void _ReadEfuseInfo8723BS(struct adapter *padapter)static void _ReadPROMContent (struct adapter *padapter) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter); -u8 eeValue; +u8 eeValue; eeValue =rtw_read8 (padapter,REG_9346CR );/* To check system boot selection. */ pEEPROM->EepromOrEfuse = (eeValue &BOOT_FROM_EEPROM ) ? true : false; pEEPROM->bautoload_fail_flag = (eeValue &EEPROM_EN ) ? false : true; -/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ +/* pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; */ _ReadEfuseInfo8723BS (padapter); }/* */ -/* Description: */ -/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ +/* Description: */ +/* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */ /* */ -/* Assumption: */ -/* PASSIVE_LEVEL (SDIO interface) */ +/* Assumption: */ +/* PASSIVE_LEVEL (SDIO interface) */ /* */ /* */ static s32 _ReadAdapterInfo8723BS (struct adapter *padapter)
@@ -1203,14 +1203,14 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int l }/* */ -/* Description: */ -/* Query setting of specified variable. */ +/* Description: */ +/* Query setting of specified variable. */ /* */ u8 GetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue ) { -u8 bResult = _SUCCESS; +u8 bResult = _SUCCESS;switch (eVariable) {case HAL_DEF_IS_SUPPORT_ANT_DIV :
Signature · 1 line
2.43.0
PATCH 2/9 staging: rtl8723bs: hal: fix whitespace in HalBtc8723b2Ant.c
Remove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +13 -13
@@ -168,7 +168,7 @@ static void halbtc8723b2ant_LimitedRx(u8 rxAggSize = aggBufSize;/* */ -/* Rx Aggregation related setting */ +/* Rx Aggregation related setting */ /* */ pBtCoexist->fBtcSet (pBtCoexist,BTC_SET_BL_TO_REJ_AP_AGG_PKT , &bRejectRxAgg);/* decide BT control aggregation buf size or not */
@@ -181,7 +181,7 @@ static void halbtc8723b2ant_LimitedRx(static void halbtc8723b2ant_QueryBtInfo (struct btc_coexist *pBtCoexist) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; pCoexSta->bC2hBtInfoReqSent = true;
@@ -418,7 +418,7 @@ static void halbtc8723b2ant_SetFwDacSwingLevel( struct btc_coexist *pBtCoexist, u8 dacSwingLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };/* There are several type of dacswing */ /* 0x18/ 0x10/ 0xc/ 0x8/ 0x4/ 0x6 */
@@ -431,7 +431,7 @@ static void halbtc8723b2ant_SetFwDecBtPwr( struct btc_coexist *pBtCoexist, u8 decBtPwrLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; H2C_Parameter[0 ] = decBtPwrLvl;
@@ -505,7 +505,7 @@ static void halbtc8723b2ant_SetSwPenaltyTxRateAdaptive( struct btc_coexist *pBtCoexist, bool bLowPenaltyRa ) { -u8 H2C_Parameter[6 ] = {0 }; +u8 H2C_Parameter[6 ] = {0 }; H2C_Parameter[0 ] =0x6 ;/* opCode, 0x6 = Retry_Penalty */
@@ -746,7 +746,7 @@ static void halbtc8723b2ant_SetFwIgnoreWlanAct( struct btc_coexist *pBtCoexist, bool bEnable ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };if (bEnable) H2C_Parameter[0 ] |=BIT0 ;/* function enable */
@@ -778,7 +778,7 @@ static void halbtc8723b2ant_SetFwPstdma(u8 byte5 ) { -u8 H2C_Parameter[5 ] = {0 }; +u8 H2C_Parameter[5 ] = {0 }; H2C_Parameter[0 ] = byte1; H2C_Parameter[1 ] = byte2;
@@ -827,7 +827,7 @@ static void halbtc8723b2ant_SetAntPath(u32 fwVer =0 , u4Tmp =0 ;bool bPgExtSwitch = false;bool bUseExtSwitch = false; -u8 H2C_Parameter[2 ] = {0 }; +u8 H2C_Parameter[2 ] = {0 }; pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_EXT_SWITCH , &bPgExtSwitch); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U4_WIFI_FW_VER , &fwVer);/* [31:16]=fw ver, [15:0]=fw sub ver */
@@ -2347,9 +2347,9 @@ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist)/* */ /* S0 or S1 setting and Local register setting(By the setting fw can get ant number, S0/S1, ... info) */ /* Local setting bit define */ -/* BIT0: "0" for no antenna inverse; "1" for antenna inverse */ -/* BIT1: "0" for internal switch; "1" for external switch */ -/* BIT2: "0" for one antenna; "1" for two antenna */ +/* BIT0: "0" for no antenna inverse; "1" for antenna inverse */ +/* BIT1: "0" for internal switch; "1" for external switch */ +/* BIT2: "0" for one antenna; "1" for two antenna */ /* NOTE: here default all internal switch and 1-antenna ==> BIT1 = 0 and BIT2 = 0 */ if (pBtCoexist->chipInterface ==BTC_INTF_USB ) {/* fixed at S0 for USB interface */
@@ -2466,8 +2466,8 @@ void EXhalbtc8723b2ant_BtInfoNotify( struct btc_coexist *pBtCoexist, u8 *tmpBuf, u8 length ) { - u8 btInfo = 0; -u8 i, rspSource =0 ; + u8 btInfo = 0; +u8 i, rspSource =0 ;bool bBtBusy = false, bLimitedDig = false;bool bWifiConnected = false;
Signature · 1 line
2.43.0
PATCH 3/9 staging: rtl8723bs: hal: fix whitespace in hal_btcoex.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +21 -21
@@ -9,14 +9,14 @@#include <hal_btcoex.h> #include <Mp_Precomp.h> -/* Global variables */ +/* Global variables */ struct btc_coexist GLBtCoexist;static u8 GLBtcWiFiInScanState;static u8 GLBtcWiFiInIQKState;/* */ -/* Debug related function */ +/* Debug related function */ /* */ static u8 halbtcoutsrc_IsBtCoexistAvailable (struct btc_coexist *pBtCoexist) {
@@ -402,9 +402,9 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)case BTC_GET_U1_MAC_PHY_MODE : *pu8 =BTC_SMSP ; -/* *pU1Tmp = BTC_DMSP; */ -/* *pU1Tmp = BTC_DMDP; */ -/* *pU1Tmp = BTC_MP_UNKNOWN; */ +/* *pU1Tmp = BTC_DMSP; */ +/* *pU1Tmp = BTC_DMDP; */ +/* *pU1Tmp = BTC_MP_UNKNOWN; */ break ;case BTC_GET_U1_AP_NUM :
@@ -562,7 +562,7 @@ static u8 halbtcoutsrc_Set(void *pBtcContext, u8 setType, void *pInBuf) }/* */ -/* IO related function */ +/* IO related function */ /* */ static u8 halbtcoutsrc_Read1Byte (void *pBtcContext,u32 RegAddr) {
@@ -773,7 +773,7 @@ static void halbtcoutsrc_FillH2cCmd(void *pBtcContext, u8 elementId, u32 cmdLen, }/* */ -/* Extern functions called by other module */ +/* Extern functions called by other module */ /* */ static u8 EXhalbtcoutsrc_BindBtCoexWithAdapter (void *padapter) {
@@ -901,14 +901,14 @@ void EXhalbtcoutsrc_IpsNotify(struct btc_coexist *pBtCoexist, u8 type) ipsType =BTC_IPS_ENTER ;/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_IpsNotify (pBtCoexist, ipsType);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_IpsNotify (pBtCoexist, ipsType); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_LpsNotify (struct btc_coexist *pBtCoexist,u8 type)
@@ -953,14 +953,14 @@ void EXhalbtcoutsrc_ScanNotify(struct btc_coexist *pBtCoexist, u8 type) }/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_ScanNotify (pBtCoexist, scanType);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_ScanNotify (pBtCoexist, scanType); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_ConnectNotify (struct btc_coexist *pBtCoexist,u8 action)
@@ -979,14 +979,14 @@ void EXhalbtcoutsrc_ConnectNotify(struct btc_coexist *pBtCoexist, u8 action) assoType =BTC_ASSOCIATE_FINISH ;/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_ConnectNotify (pBtCoexist, assoType);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_ConnectNotify (pBtCoexist, assoType); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ } void EXhalbtcoutsrc_MediaStatusNotify(struct btc_coexist *pBtCoexist, enum
@@ -1007,14 +1007,14 @@ void EXhalbtcoutsrc_MediaStatusNotify(struct btc_coexist *pBtCoexist, enum mStatus =BTC_MEDIA_DISCONNECT ;/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_MediaStatusNotify (pBtCoexist, mStatus);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_MediaStatusNotify (pBtCoexist, mStatus); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_SpecialPacketNotify (struct btc_coexist *pBtCoexist,u8 pktType)
@@ -1038,14 +1038,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy }/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_SpecialPacketNotify (pBtCoexist, packetType);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_SpecialPacketNotify (pBtCoexist, packetType); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_BtInfoNotify (struct btc_coexist *pBtCoexist,u8 *tmpBuf,u8 length)
@@ -1056,14 +1056,14 @@ void EXhalbtcoutsrc_BtInfoNotify(struct btc_coexist *pBtCoexist, u8 *tmpBuf, u8 pBtCoexist->statistics.cntBtInfoNotify++;/* All notify is called in cmd thread, don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_BtInfoNotify (pBtCoexist, tmpBuf, length);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_BtInfoNotify (pBtCoexist, tmpBuf, length); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_HaltNotify (struct btc_coexist *pBtCoexist)
@@ -1103,14 +1103,14 @@ void EXhalbtcoutsrc_Periodical(struct btc_coexist *pBtCoexist)/* Periodical should be called in cmd thread, */ /* don't need to leave low power again */ -/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ +/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ if (pBtCoexist->boardInfo.btdmAntNum ==2 )EXhalbtc8723b2ant_Periodical (pBtCoexist);else if (pBtCoexist->boardInfo.btdmAntNum ==1 )EXhalbtc8723b1ant_Periodical (pBtCoexist); -/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ +/* halbtcoutsrc_NormalLowPower(pBtCoexist); */ }void EXhalbtcoutsrc_SetAntNum (u8 type,u8 antNum)
Signature · 1 line
2.43.0
PATCH 4/9 staging: rtl8723bs: hal: fix whitespace in hal_com.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/hal_com.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +3 -3
@@ -362,7 +362,7 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg)if (bWIFICfg) {/* WMM */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 0, 1, 0, 1, 0, 0, 0, 0, 0 }; */ /* 0:ep_0 num, 1:ep_1 num */
@@ -403,7 +403,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)if (bWIFICfg) {/* for WMM */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 1, 2, 1, 0, 0, 0, 0, 0, 0 }; */ /* 0:H, 1:N, 2:L */
@@ -420,7 +420,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg) }else {/* typical setting */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 2, 2, 1, 0, 0, 0, 0, 0, 0 }; */ /* 0:H, 1:N, 2:L */
Signature · 1 line
2.43.0
PATCH 5/9 staging: rtl8723bs: hal: fix whitespace in HalPhyRf_8723B.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +58 -58
@@ -356,14 +356,14 @@ static u8 phy_PathA_IQK_8723B(/* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 ); -/* enable path A PA in TXIQK mode */ +/* enable path A PA in TXIQK mode */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0003f );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G2 , bRFRegOffsetMask,0xc7f87 ); -/* disable path B PA in TXIQK mode */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xed, bRFRegOffsetMask, 0x00020); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x43, bRFRegOffsetMask, 0x40ec1); */ +/* disable path B PA in TXIQK mode */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xed, bRFRegOffsetMask, 0x00020); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x43, bRFRegOffsetMask, 0x40ec1); */ /* 1 Tx IQK */ /* IQK setting */
@@ -374,7 +374,7 @@ static u8 phy_PathA_IQK_8723B(PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_A, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x8214010a); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x8214010a); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x821303ea );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x28110000 );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );
@@ -462,7 +462,7 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0001f );/* LNA2 off, PA on for Dcut */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G2 , bRFRegOffsetMask,0xf7fb7 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x808000 );/* IQK setting */
@@ -475,7 +475,7 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82160c1f); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82160c1f); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x82130ff0 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x28110000 );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );
@@ -546,7 +546,7 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0001f );/* LAN2 on, PA off for Dcut */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G2 , bRFRegOffsetMask,0xf7d77 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ /* PA, PAD setting */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xdf , bRFRegOffsetMask,0xf80 );
@@ -563,7 +563,7 @@ static u8 phy_PathA_RxIQK8723B(PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x82110000 ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord, 0x281604c2); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord, 0x281604c2); */ PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x2813001f );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );
@@ -605,7 +605,7 @@ static u8 phy_PathA_RxIQK8723B( regEAC =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEA4 =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord); -/* PA/PAD controlled by 0x0 */ +/* PA/PAD controlled by 0x0 */ /* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xdf , bRFRegOffsetMask,0x780 );
@@ -642,12 +642,12 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)/* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 ); -/* in TXIQK mode */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x1); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x20000); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0x0003f); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xc7f87); */ -/* enable path B PA in TXIQK mode */ +/* in TXIQK mode */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x1); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x20000); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0x0003f); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xc7f87); */ +/* enable path B PA in TXIQK mode */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xed ,0x20 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0x43 , bRFRegOffsetMask,0x30fc1 );
@@ -663,7 +663,7 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82140114); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82140114); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x821303ea );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x28110000 );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );
@@ -677,7 +677,7 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)/* switch to path B */ PHY_SetBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord,0x00000280 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ /* GNT_BT = 0 */ PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );
@@ -757,7 +757,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82160c1f); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord, 0x82160c1f); */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x82130ff0 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x28110000 );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );
@@ -771,7 +771,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)/* switch to path B */ PHY_SetBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord,0x00000280 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ /* GNT_BT = 0 */ PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );
@@ -825,15 +825,15 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0001f );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G2 , bRFRegOffsetMask,0xf7d77 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x0); */ /* open PA S1 & close SMIXER */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xed ,0x20 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0x43 , bRFRegOffsetMask,0x30ebd );/* PA, PAD setting */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0xf80); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x56, bRFRegOffsetMask, 0x51000); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0xf80); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x56, bRFRegOffsetMask, 0x51000); */ /* IQK setting */ PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK, bMaskDWord,0x01004800 );
@@ -845,7 +845,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_B, bMaskDWord,0x38008c1c );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_A, bMaskDWord,0x82110000 ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord, 0x281604c2); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord, 0x281604c2); */ PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_A, bMaskDWord,0x2813001f );PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_PI_B, bMaskDWord,0x82110000 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_PI_B, bMaskDWord,0x28110000 );
@@ -858,7 +858,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)/* switch to path B */ PHY_SetBBReg (pDM_Odm->Adapter,0x948 , bMaskDWord,0x00000280 ); -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, bRFRegOffsetMask, 0xeffe0); */ /* GNT_BT = 0 */ PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord,0x00000800 );
@@ -883,10 +883,10 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB) regEAC =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEA4 =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord); -/* PA/PAD controlled by 0x0 */ +/* PA/PAD controlled by 0x0 */ /* leave IQK mode */ -/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, 0xffffff00, 0x00000000); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_B, 0xdf, bRFRegOffsetMask, 0x180); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, 0xffffff00, 0x00000000); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_B, 0xdf, bRFRegOffsetMask, 0x180); */
@@ -960,7 +960,7 @@ static void _PHY_PathAFillIQKMatrix8723B( pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][KEY ] = rOFDM0_RxIQExtAnta; pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][VAL ] =0xfffffff &PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xC14][KEY ] = rOFDM0_XARxIQImbalance; -/* pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ +/* pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xC14][VAL ] =0x40000100 ;return ; }
@@ -1020,8 +1020,8 @@ static void _PHY_PathBFillIQKMatrix8723B(/* 2 Tx IQC */ PHY_SetBBReg (pDM_Odm->Adapter, rOFDM0_XDTxAFE,0xF0000000 , ((TX1_C &0x3C0 )>>6 )); -/* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][KEY] = rOFDM0_XDTxAFE; */ -/* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord); */ +/* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][KEY] = rOFDM0_XDTxAFE; */ +/* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord); */ pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC94][KEY ] = rOFDM0_XCTxAFE; pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC94][VAL ] =PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord);
@@ -1035,7 +1035,7 @@ static void _PHY_PathBFillIQKMatrix8723B(if (bTxOnly) { pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xC14][KEY ] = rOFDM0_XARxIQImbalance; -/* pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ +/* pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xC14][VAL ] =0x40000100 ; pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][KEY ] = rOFDM0_RxIQExtAnta; pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][VAL ] =0x0fffffff &PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord);
@@ -1051,7 +1051,7 @@ static void _PHY_PathBFillIQKMatrix8723B( pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xC14][VAL ] =PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_XBRxIQImbalance, bMaskDWord); reg = (result[final_candidate][7 ] >>6 ) &0xF ; -/* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_AGCRSSITable, 0x0000F000, reg); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_AGCRSSITable, 0x0000F000, reg); */ pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][KEY ] = rOFDM0_RxIQExtAnta; pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][VAL ] = (reg <<28 )|(PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord)&0x0fffffff ); }
@@ -1339,7 +1339,7 @@ static void phy_IQCalibrate_8723B(const u32 retryCount =2 ;/* Note: IQ calibration must be performed after loading */ -/* PHY_REG.txt , and radio_a, radio_b.txt */ +/* PHY_REG.txt , and radio_a, radio_b.txt */ /* u32 bbvalue; */
@@ -1356,8 +1356,8 @@ static void phy_IQCalibrate_8723B(/* no serial mode */ /* save RF path for 8723B */ -/* Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord); */ -/* Path_SEL_RF = PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff); */ +/* Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord); */ +/* Path_SEL_RF = PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff); */ /* MAC settings */ _PHY_MACSettingCalibration8723B (padapter,IQK_MAC_REG , pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
@@ -1370,10 +1370,10 @@ static void phy_IQCalibrate_8723B(PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_XCD_RFInterfaceSW, bMaskDWord,0x22204000 ); -/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 0x01); */ -/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 0x01); */ -/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XA_RFInterfaceOE, BIT10, 0x00); */ -/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0x00); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 0x01); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 0x01); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XA_RFInterfaceOE, BIT10, 0x00); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0x00); */ /* RX IQ calibration setting for 8723B D cut large current issue when leaving IPS */
@@ -1389,7 +1389,7 @@ static void phy_IQCalibrate_8723B(/* path A TX IQK */ for (i =0 ; i < retryCount ; i++) { PathAOK =phy_PathA_IQK_8723B (padapter, is2T, RF_Path); -/* if (PathAOK == 0x03) { */ +/* if (PathAOK == 0x03) { */ if (PathAOK ==0x01 ) {/* Path A Tx IQK Success */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 );
@@ -1407,8 +1407,8 @@ static void phy_IQCalibrate_8723B(for (i =0 ; i < retryCount ; i++) { PathAOK =phy_PathA_RxIQK8723B (padapter, is2T, RF_Path);if (PathAOK ==0x03 ) { -/* result[t][0] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ -/* result[t][1] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ +/* result[t][0] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ +/* result[t][1] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ 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 ;
@@ -1439,8 +1439,8 @@ static void phy_IQCalibrate_8723B(for (i =0 ; i < retryCount ; i++) { PathBOK =phy_PathB_RxIQK8723B (padapter, is2T);if (PathBOK ==0x03 ) { -/* result[t][0] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ -/* result[t][1] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ +/* result[t][0] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ +/* result[t][1] = (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; */ 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 ;
@@ -1463,8 +1463,8 @@ static void phy_IQCalibrate_8723B(_PHY_ReloadADDARegisters8723B (padapter,IQK_BB_REG_92C , pDM_Odm->RFCalibrateInfo.IQK_BB_backup,IQK_BB_REG_NUM );/* Reload RF path */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord, Path_SEL_BB); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff, Path_SEL_RF); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord, Path_SEL_BB); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff, Path_SEL_RF); */ /* Allen initial gain 0xc50 */ /* Restore RX initial gain */
@@ -1576,8 +1576,8 @@ void PHY_IQCalibrate_8723B( rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta }; -/* u32 Path_SEL_BB = 0; */ -u32 GNT_BT_default; +/* u32 Path_SEL_BB = 0; */ +u32 GNT_BT_default;if (!ODM_CheckPowerStatus (padapter))return ;
@@ -1643,12 +1643,12 @@ void PHY_IQCalibrate_8723B(/* save default GNT_BT */ GNT_BT_default =PHY_QueryBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord);/* Save RF Path */ -/* Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord); */ -/* Path_SEL_RF = PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff); */ +/* Path_SEL_BB = PHY_QueryBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord); */ +/* Path_SEL_RF = PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff); */ /* set GNT_BT = 0, pause BT traffic */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT12, 0x0); */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT11, 0x1); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT12, 0x0); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT11, 0x1); */ for (i =0 ; i <8 ; i++) {
@@ -1743,8 +1743,8 @@ void PHY_IQCalibrate_8723B(/* restore GNT_BT */ PHY_SetBBReg (pDM_Odm->Adapter,0x764 , bMaskDWord, GNT_BT_default);/* Restore RF Path */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord, Path_SEL_BB); */ -/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff, Path_SEL_RF); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord, Path_SEL_BB); */ +/* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xb0, 0xfffff, Path_SEL_RF); */ /* Resotr RX mode table parameter */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );
@@ -1755,8 +1755,8 @@ void PHY_IQCalibrate_8723B(PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0x43 , bRFRegOffsetMask,0x300bd );/* set GNT_BT = HW control */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT12, 0x0); */ -/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT11, 0x0); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT12, 0x0); */ +/* PHY_SetBBReg(pDM_Odm->Adapter, 0x764, BIT11, 0x0); */ if (Is2ant) {if (RF_Path ==0x0 )/* S1 */
@@ -1772,7 +1772,7 @@ void PHY_IQCalibrate_8723B(void PHY_LCCalibrate_8723B (struct dm_odm_t *pDM_Odm) {bool bSingleTone = false, bCarrierSuppression = false; -u32 timeout =2000 , timecount =0 ; +u32 timeout =2000 , timecount =0 ;if (!(pDM_Odm->SupportAbility &ODM_RF_CALIBRATION ))return ;
Signature · 1 line
2.43.0
PATCH 6/9 staging: rtl8723bs: hal: fix whitespace in rtl8723b_cmd.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +2 -2
@@ -79,7 +79,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdelse {memcpy ((u8 *)(&h2c_cmd)+1 , pCmdBuffer,3 );memcpy ((u8 *)(&h2c_cmd_ex), pCmdBuffer+3 , CmdLen-3 ); -/* *(u8 *)(&h2c_cmd) |= BIT(7); */ +/* *(u8 *)(&h2c_cmd) |= BIT(7); */ } *(u8 *)(&h2c_cmd) |= ElementID;
@@ -927,7 +927,7 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter) DLBcnCount++; do { yield(); -/* mdelay(10); */ +/* mdelay(10); */ /* check rsvd page download OK. */ rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid); poll++;
Signature · 1 line
2.43.0
PATCH 7/9 staging: rtl8723bs: hal: fix whitespace in rtl8723b_dm.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +2 -2
@@ -42,7 +42,7 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_CUT_VER , cut_ver);ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_PATCH_ID , pHalData->CustomerID); -/* ODM_CMNINFO_BINHCT_TEST only for MP Team */ +/* ODM_CMNINFO_BINHCT_TEST only for MP Team */ ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_BWIFI_TEST , Adapter->registrypriv.wifi_spec); pdmpriv->InitODMFlag =ODM_RF_CALIBRATION |ODM_RF_TX_PWR_TRACK ;
@@ -80,7 +80,7 @@ static void Update_ODM_ComInfo_8723b(struct adapter *Adapter)/* Pointer reference */ /* */ /* ODM_CMNINFO_MAC_PHY_MODE pHalData->MacPhyMode92D */ -/* ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_MAC_PHY_MODE,&(pDM_Odm->u8_temp)); */ +/* ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_MAC_PHY_MODE,&(pDM_Odm->u8_temp)); */ ODM_CmnInfoUpdate (pDM_Odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag);
Signature · 1 line
2.43.0
PATCH 8/9 staging: rtl8723bs: hal: fix whitespace in rtl8723b_hal_init.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +20 -20
@@ -286,8 +286,8 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter) }/* */ -/* Description: */ -/* Download 8192C firmware code. */ +/* Description: */ +/* Download 8192C firmware code. */ /* */ /* */ s32 rtl8723b_FirmwareDownload (struct adapter *padapter,bool bUsedWoWLANFw)
@@ -440,7 +440,7 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter) }/* */ -/* Efuse related code */ +/* Efuse related code */ /* */ static u8 hal_EfuseSwitchToBank ( struct adapter *padapter, u8 bank
@@ -1088,9 +1088,9 @@ void rtl8723b_init_default_value(struct adapter *padapter)/* init dm default value */ pdmpriv->TM_Trigger =0 ;/* for IQK */ -/* pdmpriv->binitialized = false; */ -/* pdmpriv->prv_traffic_idx = 3; */ -/* pdmpriv->initialize = 0; */ +/* pdmpriv->binitialized = false; */ +/* pdmpriv->prv_traffic_idx = 3; */ +/* pdmpriv->initialize = 0; */ pdmpriv->ThermalValue_HP_index =0 ;for (i =0 ; i <HP_THERMAL_NUM ; i++)
@@ -1197,7 +1197,7 @@ void Hal_InitPGData(struct adapter *padapter, u8 *PROMContent)void Hal_EfuseParseIDCode (struct adapter *padapter,u8 *hwinfo) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter); -/* struct hal_com_data *pHalData = GET_HAL_DATA(padapter); */ +/* struct hal_com_data *pHalData = GET_HAL_DATA(padapter); */ u16 EEPROMId;
@@ -1330,7 +1330,7 @@ void Hal_EfuseParseTxPowerInfo_8723B( {struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct TxPowerInfo24G pwrInfo24G; -u8 rfPath, ch, TxCount =1 ; +u8 rfPath, ch, TxCount =1 ;Hal_ReadPowerValueFromPROM_8723B (padapter, &pwrInfo24G, PROMContent, AutoLoadFail);for (rfPath =0 ; rfPath <MAX_RF_PATH ; rfPath++) {
@@ -1576,7 +1576,7 @@ u8 BWMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib) BWSettingOfDesc =0 ;/* if (pTcb->bBTTxPacket) */ -/* BWSettingOfDesc = 0; */ +/* BWSettingOfDesc = 0; */ return BWSettingOfDesc; }
@@ -1859,8 +1859,8 @@ void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf)/* */ /* Description: In normal chip, we should send some packet to Hw which will be used by Fw */ -/* in FW LPS mode. The function is to fill the Tx descriptor of this packets, then */ -/* Fw can tell Hw to send these packet derectly. */ +/* in FW LPS mode. The function is to fill the Tx descriptor of this packets, then */ +/* Fw can tell Hw to send these packet derectly. */ /* Added by tynli. 2009.10.15. */ /* */ /* type1:pspoll, type2:null */
@@ -2254,11 +2254,11 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)break ;case C2H_CCX_TX_RPT : -/* CCX_FwC2HTxRpt(padapter, QueueID, pC2hEvent->payload); */ +/* CCX_FwC2HTxRpt(padapter, QueueID, pC2hEvent->payload); */ break ;case C2H_EXT_RA_RPT : -/* C2HExtRaRptHandler(padapter, pC2hEvent->payload, C2hEvent.CmdLen); */ +/* C2HExtRaRptHandler(padapter, pC2hEvent->payload, C2hEvent.CmdLen); */ break ;case C2H_HW_INFO_EXCH :
@@ -2274,8 +2274,8 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)/* Clear event to notify FW we have read the command. */ /* Note: */ -/* If this field isn't clear, the FW won't update the next command message. */ -/* rtw_write8(padapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); */ +/* If this field isn't clear, the FW won't update the next command message. */ +/* rtw_write8(padapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); */ exit:return ret; }
@@ -2294,11 +2294,11 @@ static void process_c2h_event(struct adapter *padapter, struct c2h_evt_hdr_t *pCbreak ;case C2H_CCX_TX_RPT : -/* CCX_FwC2HTxRpt(padapter, QueueID, tmpBuf); */ +/* CCX_FwC2HTxRpt(padapter, QueueID, tmpBuf); */ break ;case C2H_EXT_RA_RPT : -/* C2HExtRaRptHandler(padapter, tmpBuf, C2hEvent.CmdLen); */ +/* C2HExtRaRptHandler(padapter, tmpBuf, C2hEvent.CmdLen); */ break ;case C2H_HW_INFO_EXCH :
@@ -2435,7 +2435,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)break ;case 2 :/* sta add event callback */ -/* rtw_btcoex_MediaStatusNotify(padapter, RT_MEDIA_CONNECT); */ +/* rtw_btcoex_MediaStatusNotify(padapter, RT_MEDIA_CONNECT); */ break ; }break ;
@@ -2588,9 +2588,9 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) }/* if (psmode != PS_MODE_ACTIVE) { */ -/* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */ +/* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */ /* else { */ -/* rtl8723b_set_lowpwr_lps_cmd(padapter, false); */ +/* rtl8723b_set_lowpwr_lps_cmd(padapter, false); */ /* */ rtl8723b_set_FwPwrMode_cmd (padapter, psmode); }
Signature · 1 line
2.43.0
PATCH 9/9 staging: rtl8723bs: hal: fix whitespace in rtl8723bs_recv.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +5 -5
@@ -268,9 +268,9 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)rtw_free_recvframe (precvframe, &precvpriv->free_recv_queue); }else { -/* Modified by Albert 20101213 */ -/* For 8 bytes IP header alignment. */ -if (pattrib->qos)/* Qos data, wireless lan header length is 26 */ +/* Modified by Albert 20101213 */ +/* For 8 bytes IP header alignment. */ +if (pattrib->qos)/* Qos data, wireless lan header length is 26 */ shift_sz =6 ;else shift_sz =0 ;
@@ -286,8 +286,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) alloc_sz = skb_len +14 ; }else { alloc_sz = skb_len; -/* 6 is for IP header 8 bytes alignment in QoS packet case. */ -/* 8 is for skb->data 4 bytes alignment. */ +/* 6 is for IP header 8 bytes alignment in QoS packet case. */ +/* 8 is for skb->data 4 bytes alignment. */ alloc_sz +=14 ; }
Signature · 1 line
2.43.0
Quoted 12 lines · Quentin Strydom
Remove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-)drivers/staging/rtl8723bs/hal/sdio_halinit.c +0
-0
drivers/staging/rtl8723bs/hal/sdio_halinit.c u8 _InitPowerOn_8723BS(struct adapter *padapter) · line 49
Quoted 5 lines
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1
-1@@ -46,7 +46,7 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)u16 value16;u32 value32;u8 ret; -/* u8 bMacPwrCtrlOn; */ +/* u8 bMacPwrCtrlOn; */
You're not working against current code. Use linux-next or staging-next.
We don't reformat commented out code, we just delete it.
regards,
dan carpenter
PATCH v2 1/7 staging: rtl8723bs: hal: fix space-before-tab warnings in HalBtc8723b2Ant.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
.../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +13 -13
@@ -168,7 +168,7 @@ static void halbtc8723b2ant_LimitedRx(u8 rxAggSize = aggBufSize;/* */ -/* Rx Aggregation related setting */ +/* Rx Aggregation related setting */ /* */ pBtCoexist->fBtcSet (pBtCoexist,BTC_SET_BL_TO_REJ_AP_AGG_PKT , &bRejectRxAgg);/* decide BT control aggregation buf size or not */
@@ -181,7 +181,7 @@ static void halbtc8723b2ant_LimitedRx(static void halbtc8723b2ant_QueryBtInfo (struct btc_coexist *pBtCoexist) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; pCoexSta->bC2hBtInfoReqSent = true;
@@ -417,7 +417,7 @@ static void halbtc8723b2ant_SetFwDacSwingLevel( struct btc_coexist *pBtCoexist, u8 dacSwingLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };/* There are several type of dacswing */ /* 0x18/ 0x10/ 0xc/ 0x8/ 0x4/ 0x6 */
@@ -430,7 +430,7 @@ static void halbtc8723b2ant_SetFwDecBtPwr( struct btc_coexist *pBtCoexist, u8 decBtPwrLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; H2C_Parameter[0 ] = decBtPwrLvl;
@@ -504,7 +504,7 @@ static void halbtc8723b2ant_SetSwPenaltyTxRateAdaptive( struct btc_coexist *pBtCoexist, bool bLowPenaltyRa ) { -u8 H2C_Parameter[6 ] = {0 }; +u8 H2C_Parameter[6 ] = {0 }; H2C_Parameter[0 ] =0x6 ;/* opCode, 0x6 = Retry_Penalty */
@@ -743,7 +743,7 @@ static void halbtc8723b2ant_SetFwIgnoreWlanAct( struct btc_coexist *pBtCoexist, bool bEnable ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };if (bEnable) H2C_Parameter[0 ] |=BIT (0 );/* function enable */
@@ -775,7 +775,7 @@ static void halbtc8723b2ant_SetFwPstdma(u8 byte5 ) { -u8 H2C_Parameter[5 ] = {0 }; +u8 H2C_Parameter[5 ] = {0 }; H2C_Parameter[0 ] = byte1; H2C_Parameter[1 ] = byte2;
@@ -824,7 +824,7 @@ static void halbtc8723b2ant_SetAntPath(u32 fwVer =0 , u4Tmp =0 ;bool bPgExtSwitch = false;bool bUseExtSwitch = false; -u8 H2C_Parameter[2 ] = {0 }; +u8 H2C_Parameter[2 ] = {0 }; pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_EXT_SWITCH , &bPgExtSwitch); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U4_WIFI_FW_VER , &fwVer);/* [31:16]=fw ver, [15:0]=fw sub ver */
@@ -2341,9 +2341,9 @@ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist)/* */ /* S0 or S1 setting and Local register setting(By the setting fw can get ant number, S0/S1, ... info) */ /* Local setting bit define */ -/* BIT0: "0" for no antenna inverse; "1" for antenna inverse */ -/* BIT1: "0" for internal switch; "1" for external switch */ -/* BIT2: "0" for one antenna; "1" for two antenna */ +/* BIT0: "0" for no antenna inverse; "1" for antenna inverse */ +/* BIT1: "0" for internal switch; "1" for external switch */ +/* BIT2: "0" for one antenna; "1" for two antenna */ /* NOTE: here default all internal switch and 1-antenna ==> BIT1 = 0 and BIT2 = 0 */ if (pBtCoexist->chipInterface ==BTC_INTF_USB ) {/* fixed at S0 for USB interface */
@@ -2460,8 +2460,8 @@ void EXhalbtc8723b2ant_BtInfoNotify( struct btc_coexist *pBtCoexist, u8 *tmpBuf, u8 length ) { - u8 btInfo = 0; -u8 i, rspSource =0 ; + u8 btInfo = 0; +u8 i, rspSource =0 ;bool bBtBusy = false, bLimitedDig = false;bool bWifiConnected = false;
Signature · 1 line
2.43.0
PATCH v2 2/7 staging: rtl8723bs: hal: fix space-before-tab warnings in hal_btcoex.c
Remove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +4 -4
@@ -9,14 +9,14 @@#include <hal_btcoex.h> #include <Mp_Precomp.h> -/* Global variables */ +/* Global variables */ struct btc_coexist GLBtCoexist;static u8 GLBtcWiFiInScanState;static u8 GLBtcWiFiInIQKState;/* */ -/* Debug related function */ +/* Debug related function */ /* */ static u8 halbtcoutsrc_IsBtCoexistAvailable (struct btc_coexist *pBtCoexist) {
@@ -549,7 +549,7 @@ static u8 halbtcoutsrc_Set(void *pBtcContext, u8 setType, void *pInBuf) }/* */ -/* IO related function */ +/* IO related function */ /* */ static u8 halbtcoutsrc_Read1Byte (void *pBtcContext,u32 RegAddr) {
@@ -747,7 +747,7 @@ static void halbtcoutsrc_FillH2cCmd(void *pBtcContext, u8 elementId, u32 cmdLen, }/* */ -/* Extern functions called by other module */ +/* Extern functions called by other module */ /* */ static u8 EXhalbtcoutsrc_BindBtCoexWithAdapter (void *padapter) {
Signature · 1 line
2.43.0
PATCH v2 3/7 staging: rtl8723bs: hal: fix space-before-tab warnings in hal_com.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/hal_com.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +3 -3
@@ -319,7 +319,7 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg)if (bWIFICfg) {/* WMM */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 0, 1, 0, 1, 0, 0, 0, 0, 0 }; */ /* 0:ep_0 num, 1:ep_1 num */
@@ -359,7 +359,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg)if (bWIFICfg) {/* for WMM */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 1, 2, 1, 0, 0, 0, 0, 0, 0 }; */ /* 0:H, 1:N, 2:L */
@@ -375,7 +375,7 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg) }else {/* typical setting */ -/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ +/* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ /* 2, 2, 1, 0, 0, 0, 0, 0, 0 }; */ /* 0:H, 1:N, 2:L */
Signature · 1 line
2.43.0
PATCH v2 4/7 staging: rtl8723bs: hal: fix space-before-tab warnings in HalPhyRf_8723B.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +9 -9
@@ -354,12 +354,12 @@ static u8 phy_PathA_IQK_8723B(/* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 ); -/* enable path A PA in TXIQK mode */ +/* enable path A PA in TXIQK mode */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_WE_LUT ,0x80000 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_RCK_OS , bRFRegOffsetMask,0x18000 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G1 , bRFRegOffsetMask,0x0003f );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,RF_TXPA_G2 , bRFRegOffsetMask,0xc7f87 ); -/* disable path B PA in TXIQK mode */ +/* disable path B PA in TXIQK mode */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xed, bRFRegOffsetMask, 0x00020); */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x43, bRFRegOffsetMask, 0x40ec1); */
@@ -600,7 +600,7 @@ static u8 phy_PathA_RxIQK8723B( regEAC =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEA4 =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord); -/* PA/PAD controlled by 0x0 */ +/* PA/PAD controlled by 0x0 */ /* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xdf , bRFRegOffsetMask,0x780 );
@@ -637,12 +637,12 @@ static u8 phy_PathB_IQK_8723B(struct adapter *padapter)/* leave IQK mode */ PHY_SetBBReg (pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes,0x000000 ); -/* in TXIQK mode */ +/* in TXIQK mode */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_WE_LUT, 0x80000, 0x1); */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x20000); */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0x0003f); */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xc7f87); */ -/* enable path B PA in TXIQK mode */ +/* enable path B PA in TXIQK mode */ PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0xed ,0x20 ,0x1 );PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH_A ,0x43 , bRFRegOffsetMask,0x30fc1 );
@@ -873,7 +873,7 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB) regEAC =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEA4 =PHY_QueryBBReg (pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord); -/* PA/PAD controlled by 0x0 */ +/* PA/PAD controlled by 0x0 */ /* leave IQK mode */ /* PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, 0xffffff00, 0x00000000); */ /* PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_B, 0xdf, bRFRegOffsetMask, 0x180); */
@@ -1322,7 +1322,7 @@ static void phy_IQCalibrate_8723B(const u32 retryCount =2 ;/* Note: IQ calibration must be performed after loading */ -/* PHY_REG.txt , and radio_a, radio_b.txt */ +/* PHY_REG.txt , and radio_a, radio_b.txt */ /* u32 bbvalue; */
@@ -1554,7 +1554,7 @@ void PHY_IQCalibrate_8723B( rOFDM0_RxIQExtAnta };/* u32 Path_SEL_BB = 0; */ -u32 GNT_BT_default; +u32 GNT_BT_default;if (!ODM_CheckPowerStatus (padapter))return ;
@@ -1745,7 +1745,7 @@ void PHY_IQCalibrate_8723B(void PHY_LCCalibrate_8723B (struct dm_odm_t *pDM_Odm) {bool bSingleTone = false, bCarrierSuppression = false; -u32 timeout =2000 , timecount =0 ; +u32 timeout =2000 , timecount =0 ;if (!(pDM_Odm->SupportAbility &ODM_RF_CALIBRATION ))return ;
Signature · 1 line
2.43.0
PATCH v2 5/7 staging: rtl8723bs: hal: fix space-before-tab warnings in rtl8723b_dm.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +1 -1
@@ -42,7 +42,7 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_CUT_VER , cut_ver);ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_PATCH_ID , pHalData->CustomerID); -/* ODM_CMNINFO_BINHCT_TEST only for MP Team */ +/* ODM_CMNINFO_BINHCT_TEST only for MP Team */ ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_BWIFI_TEST , Adapter->registrypriv.wifi_spec); pdmpriv->InitODMFlag =ODM_RF_CALIBRATION |ODM_RF_TX_PWR_TRACK ;
Signature · 1 line
2.43.0
PATCH v2 6/7 staging: rtl8723bs: hal: fix space-before-tab warnings in rtl8723b_hal_init.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +7 -7
@@ -283,8 +283,8 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter) }/* */ -/* Description: */ -/* Download 8192C firmware code. */ +/* Description: */ +/* Download 8192C firmware code. */ /* */ /* */ s32 rtl8723b_FirmwareDownload (struct adapter *padapter,bool bUsedWoWLANFw)
@@ -437,7 +437,7 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter) }/* */ -/* Efuse related code */ +/* Efuse related code */ /* */ static u8 hal_EfuseSwitchToBank ( struct adapter *padapter, u8 bank
@@ -1310,7 +1310,7 @@ void Hal_EfuseParseTxPowerInfo_8723B( {struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct TxPowerInfo24G pwrInfo24G; -u8 rfPath, ch, TxCount =1 ; +u8 rfPath, ch, TxCount =1 ;Hal_ReadPowerValueFromPROM_8723B (padapter, &pwrInfo24G, PROMContent, AutoLoadFail);for (rfPath =0 ; rfPath <MAX_RF_PATH ; rfPath++) {
@@ -1834,8 +1834,8 @@ void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf)/* */ /* Description: In normal chip, we should send some packet to Hw which will be used by Fw */ -/* in FW LPS mode. The function is to fill the Tx descriptor of this packets, then */ -/* Fw can tell Hw to send these packet derectly. */ +/* in FW LPS mode. The function is to fill the Tx descriptor of this packets, then */ +/* Fw can tell Hw to send these packet derectly. */ /* Added by tynli. 2009.10.15. */ /* */ /* type1:pspoll, type2:null */
@@ -2246,7 +2246,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf)/* Clear event to notify FW we have read the command. */ /* Note: */ -/* If this field isn't clear, the FW won't update the next command message. */ +/* If this field isn't clear, the FW won't update the next command message. */ /* rtw_write8(padapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); */ exit:return ret;
Signature · 1 line
2.43.0
PATCH v2 7/7 staging: rtl8723bs: hal: fix space-before-tab warnings in rtl8723bs_recv.c
In reply to Quentin StrydomRemove spaces before tabs in comments to match kernel coding style.
Signed-off-by Quentin Strydom <[email protected]>
---
v2:
- Rebased onto staging-next as requested
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +5 -5
@@ -267,9 +267,9 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)rtw_free_recvframe (precvframe, &precvpriv->free_recv_queue); }else { -/* Modified by Albert 20101213 */ -/* For 8 bytes IP header alignment. */ -if (pattrib->qos)/* Qos data, wireless lan header length is 26 */ +/* Modified by Albert 20101213 */ +/* For 8 bytes IP header alignment. */ +if (pattrib->qos)/* Qos data, wireless lan header length is 26 */ shift_sz =6 ;else shift_sz =0 ;
@@ -285,8 +285,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) alloc_sz = skb_len +14 ; }else { alloc_sz = skb_len; -/* 6 is for IP header 8 bytes alignment in QoS packet case. */ -/* 8 is for skb->data 4 bytes alignment. */ +/* 6 is for IP header 8 bytes alignment in QoS packet case. */ +/* 8 is for skb->data 4 bytes alignment. */ alloc_sz +=14 ; }
Signature · 1 line
2.43.0