staging: rtl8723bs: Change several files of the driver
v4 cover staging: rtl8723bs: Change several files of the driver
Remove camelcase, correct misspelled words in comments, change the type of a variable and its use, change comparisons with 'true' in controlling expressions.
Changes from v3: Move changes of controlling expressions in patch 4/4. Changes from v2: Rewrite subject in patch 0/4; remove a patch from the series because it had alreay been applied (rtl8723bs: core: Remove an unused variable). Changes from v1: Fix a typo in subject of patch 1/5, add patch 5/5.
Fabio M. De Francesco (4):
staging: rtl8723bs: Remove camelcase in several files
staging: rtl8723bs: include: Fix misspelled words in comments
staging: rtl8723bs: include: Change the type of a variable
staging: rtl8723bs: Change controlling expressions
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 18 +++++----- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 6 ++-- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 14 ++++---- .../rtl8723bs/include/Hal8192CPhyReg.h | 8 ++--- .../staging/rtl8723bs/include/basic_types.h | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 2 +- drivers/staging/rtl8723bs/include/hal_com.h | 2 +- .../staging/rtl8723bs/include/hal_com_reg.h | 34 +++++++++---------- drivers/staging/rtl8723bs/include/hal_data.h | 2 +- .../staging/rtl8723bs/include/hal_pwr_seq.h | 2 +- drivers/staging/rtl8723bs/include/rtw_cmd.h | 6 ++-- drivers/staging/rtl8723bs/include/rtw_mlme.h | 18 +++++----- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/include/rtw_mp.h | 2 +- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 4 +-- drivers/staging/rtl8723bs/include/rtw_recv.h | 4 +-- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 2 +- 23 files changed, 70 insertions(+), 70 deletions(-)
Signature · 1 line
2.31.1
PATCH v4 1/4 staging: rtl8723bs: Remove camelcase in several files
Remove camelcase in bFwCurrentInPSMode, a variable used by code of several subdirectories/files of the driver. Issue detected by checkpatch.pl. Delete the unnecessary "b" (that stands for "byte") from the beginning of the name.
---
Changes from v3: Move changes of controlling expressions in patch 4/4. Changes from v2: Rewrite subject in patch 0/4; remove a patch from the series because it had alreay been applied (rtl8723bs: core: Remove an unused variable). Changes from v1: Fix a typo in subject of patch 1/5, add patch 5/5.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 18 +++++++++--------- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 6 +++--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 14 +++++++------- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1507,7 +1507,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)if (pwrpriv->dtim != dtim) pwrpriv->dtim = dtim; -if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) { +if ((pwrpriv->fw_current_in_ps_mode == true) && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) {u8 ps_mode = pwrpriv->pwr_mode;rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode));
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1684,7 +1684,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (adapter->net_closed)return ; -if ((adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) +if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) && !(hal_btcoex_IsBtControlLps (adapter)) ) {u8 bEnterPS;
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +9 -9
@@ -365,7 +365,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_artw_set_rpwm (padapter,PS_STATE_S4 );rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); - pwrpriv->bFwCurrentInPSMode = false; + pwrpriv->fw_current_in_ps_mode = false;hal_btcoex_LpsNotify (padapter, ps_mode); }
@@ -377,7 +377,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ahal_btcoex_LpsNotify (padapter, ps_mode); - pwrpriv->bFwCurrentInPSMode = true; + pwrpriv->fw_current_in_ps_mode = true; pwrpriv->pwr_mode = ps_mode; pwrpriv->smart_ps = smart_ps; pwrpriv->bcn_ant_mode = bcn_ant_mode;
@@ -734,7 +734,7 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task)register_task_alive (pwrctrl, task); -if (pwrctrl->bFwCurrentInPSMode) { +if (pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -782,7 +782,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task)unregister_task_alive (pwrctrl, task); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm > pslv)if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
@@ -819,7 +819,7 @@ s32 rtw_register_tx_alive(struct adapter *padapter)register_task_alive (pwrctrl,XMIT_ALIVE ); -if (pwrctrl->bFwCurrentInPSMode) { +if (pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -864,7 +864,7 @@ s32 rtw_register_cmd_alive(struct adapter *padapter)register_task_alive (pwrctrl,CMD_ALIVE ); -if (pwrctrl->bFwCurrentInPSMode) { +if (pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm < pslv) {if (pwrctrl->cpwm <PS_STATE_S2 ) res = _FAIL;
@@ -909,7 +909,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,XMIT_ALIVE ); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm > pslv)if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
@@ -945,7 +945,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter)unregister_task_alive (pwrctrl,CMD_ALIVE ); -if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->bFwCurrentInPSMode) { +if ((pwrctrl->pwr_mode !=PS_MODE_ACTIVE ) && pwrctrl->fw_current_in_ps_mode) {if (pwrctrl->cpwm > pslv) {if ((pslv >=PS_STATE_S2 ) || (pwrctrl->alives ==0 ))rtw_set_rpwm (padapter, pslv);
@@ -978,7 +978,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/* PS_MODE_MIN; */ pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt !=PS_MODE_ACTIVE ; - pwrctrlpriv->bFwCurrentInPSMode = false; + pwrctrlpriv->fw_current_in_ps_mode = false; pwrctrlpriv->rpwm =0 ; pwrctrlpriv->cpwm =PS_STATE_S4 ;
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -1
@@ -348,7 +348,7 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)void rtw_hal_dm_watchdog_in_lps (struct adapter *padapter) { -if (adapter_to_pwrctl (padapter)->bFwCurrentInPSMode == true) { +if (adapter_to_pwrctl (padapter)->fw_current_in_ps_mode == true) {if (padapter->HalFunc.hal_dm_watchdog_in_lps) padapter->HalFunc.hal_dm_watchdog_in_lps (padapter);/* this function caller is in interrupt context */ }
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +3 -3
@@ -141,7 +141,7 @@ void rtl8723b_InitHalDm(struct adapter *Adapter)void rtl8723b_HalDmWatchDog (struct adapter *Adapter) { -bool bFwCurrentInPSMode = false; +bool fw_current_in_ps_mode = false;bool bFwPSAwake = true;u8 hw_init_completed = false;struct hal_com_data *pHalData =GET_HAL_DATA (Adapter);
@@ -151,12 +151,12 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter)if (hw_init_completed == false) goto skip_dm; - bFwCurrentInPSMode =adapter_to_pwrctl (Adapter)->bFwCurrentInPSMode; + fw_current_in_ps_mode =adapter_to_pwrctl (Adapter)->fw_current_in_ps_mode;rtw_hal_get_hwreg (Adapter,HW_VAR_FWLPS_RF_ON , (u8 *)(&bFwPSAwake));if ( (hw_init_completed == true) && - ((!bFwCurrentInPSMode) && bFwPSAwake) + ((!fw_current_in_ps_mode) && bFwPSAwake) ) {/* */ /* Calculate Tx/Rx statistics. */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -1
@@ -428,7 +428,7 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter)struct hal_com_data *pHalData =GET_HAL_DATA (padapter);/* Init Fw LPS related. */ -adapter_to_pwrctl (padapter)->bFwCurrentInPSMode = false; +adapter_to_pwrctl (padapter)->fw_current_in_ps_mode = false;/* Init H2C cmd. */ rtw_write8 (padapter,REG_HMETFR ,0x0f );
drivers/staging/rtl8723bs/hal/sdio_ops.c +7 -7
@@ -170,7 +170,7 @@ static u32 sdio_read32(struct intf_hdl *intfhdl, u32 addr)if ( ((device_id ==WLAN_IOREG_DEVICE_ID ) && (offset <0x100 )) || (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) ) { err =sd_cmd52_read (intfhdl, ftaddr,4 , (u8 *)&le_tmp);return le32_to_cpu (le_tmp);
@@ -216,7 +216,7 @@ static s32 sdio_readN(struct intf_hdl *intfhdl, u32 addr, u32 cnt, u8 *buf)if ( ((device_id ==WLAN_IOREG_DEVICE_ID ) && (offset <0x100 )) || (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) )return sd_cmd52_read (intfhdl, ftaddr, cnt, buf);
@@ -283,7 +283,7 @@ static s32 sdio_write32(struct intf_hdl *intfhdl, u32 addr, u32 val)if ( ((device_id ==WLAN_IOREG_DEVICE_ID ) && (offset <0x100 )) || (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) ) { le_tmp =cpu_to_le32 (val);
@@ -320,7 +320,7 @@ static s32 sdio_writeN(struct intf_hdl *intfhdl, u32 addr, u32 cnt, u8 *buf)if ( ((device_id ==WLAN_IOREG_DEVICE_ID ) && (offset <0x100 )) || (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) )return sd_cmd52_write (intfhdl, ftaddr, cnt, buf);
@@ -551,7 +551,7 @@ s32 sdio_local_read(rtw_hal_get_hwreg (adapter,HW_VAR_APFM_ON_MAC , &mac_pwr_ctrl_on);if ( (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) )return sd_cmd52_read (intfhdl, addr, cnt, buf);
@@ -591,7 +591,7 @@ s32 sdio_local_write(rtw_hal_get_hwreg (adapter,HW_VAR_APFM_ON_MAC , &mac_pwr_ctrl_on);if ( (!mac_pwr_ctrl_on) || - (adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) + (adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) )return sd_cmd52_write (intfhdl, addr, cnt, buf);
@@ -640,7 +640,7 @@ static u32 sdio_local_cmd53_read4byte(struct adapter *adapter, u32 addr)hal_sdio_get_cmd_addr_8723b (adapter,SDIO_LOCAL_DEVICE_ID , addr, &addr);rtw_hal_get_hwreg (adapter,HW_VAR_APFM_ON_MAC , &mac_pwr_ctrl_on); -if (!mac_pwr_ctrl_on ||adapter_to_pwrctl (adapter)->bFwCurrentInPSMode) { +if (!mac_pwr_ctrl_on ||adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) {sd_cmd52_read (intfhdl, addr,4 , (u8 *)&le_tmp); val =le32_to_cpu (le_tmp); }else {
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +1 -1
@@ -203,7 +203,7 @@ struct pwrctrl_priv {u8 LpsIdleCount;u8 power_mgnt;u8 org_power_mgnt; -u8 bFwCurrentInPSMode; +u8 fw_current_in_ps_mode;unsigned long DelayLPSLastTimeStamp;s32 pnp_current_pwr_state;u8 pnp_bstop_trx;
Signature · 1 line
2.31.1
PATCH v4 2/4 staging: rtl8723bs: include: Fix misspelled words in comments
In reply to Fabio M. De FrancescoCorrect misspelled words in comments of several files. Issue (largely) detected by checkpatch.pl.
---
Changes from v3: Move changes of controlling expressions in patch 4/4. Changes from v2: Rewrite subject in patch 0/4; remove a patch from the series because it had alreay been applied (rtl8723bs: core: Remove an unused variable). Changes from v1: Fix a typo in subject of patch 1/5, add patch 5/5.
.../rtl8723bs/include/Hal8192CPhyReg.h | 8 ++--- .../staging/rtl8723bs/include/basic_types.h | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 2 +- drivers/staging/rtl8723bs/include/hal_com.h | 2 +- .../staging/rtl8723bs/include/hal_com_reg.h | 34 +++++++++---------- drivers/staging/rtl8723bs/include/hal_data.h | 2 +- .../staging/rtl8723bs/include/hal_pwr_seq.h | 2 +- drivers/staging/rtl8723bs/include/rtw_cmd.h | 6 ++-- drivers/staging/rtl8723bs/include/rtw_mlme.h | 18 +++++----- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/include/rtw_mp.h | 2 +- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- drivers/staging/rtl8723bs/include/rtw_recv.h | 4 +-- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 2 +- 16 files changed, 46 insertions(+), 46 deletions(-)
drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h +4 -4
@@ -34,7 +34,7 @@/*--------------------------Define Parameters-------------------------------*/ /* */ -/* 8192S Regsiter offset definition */ +/* 8192S Register offset definition */ /* */ /* */
@@ -43,7 +43,7 @@/* 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 */ /* 3. RF register 0x00-2E */ /* 4. Bit Mask for BB/RF register */ -/* 5. Other defintion for BB/RF R/W */ +/* 5. Other definition for BB/RF R/W */ /* */
@@ -137,7 +137,7 @@#define rFPGA0_AnalogParameter3 0x888/* Useless now */ #define rFPGA0_AnalogParameter4 0x88c -#define rFPGA0_XA_LSSIReadBack 0x8a0/* Tranceiver LSSI Readback */ +#define rFPGA0_XA_LSSIReadBack 0x8a0/* Transceiver LSSI Readback */ #define rFPGA0_XB_LSSIReadBack 0x8a4#define rFPGA0_XC_LSSIReadBack 0x8a8#define rFPGA0_XD_LSSIReadBack 0x8ac
@@ -206,7 +206,7 @@#define rOFDM0_TRSWIsolation 0xc0c#define rOFDM0_XARxAFE 0xc10/* RxIQ DC offset, Rx digital filter, DC notch filter */ -#define rOFDM0_XARxIQImbalance 0xc14/* RxIQ imblance matrix */ +#define rOFDM0_XARxIQImbalance 0xc14/* RxIQ imbalance matrix */ #define rOFDM0_XBRxAFE 0xc18#define rOFDM0_XBRxIQImbalance 0xc1c#define rOFDM0_XCRxAFE 0xc20
drivers/staging/rtl8723bs/include/basic_types.h +1 -1
@@ -187,7 +187,7 @@ ); \ } -/* Get the N-bytes aligment offset from the current length */ +/* Get the N-bytes alignent offset from the current length */ #define N_BYTE_ALIGMENT (__Value, __Aligment) ((__Aligment == 1) ? (__Value) : (((__Value + __Aligment - 1) / __Aligment) * __Aligment))#define TEST_FLAG (__Flag, __testFlag) (((__Flag) & (__testFlag)) != 0)
drivers/staging/rtl8723bs/include/drv_types.h +1 -1
@@ -424,7 +424,7 @@ struct adapter {/* The driver will show up the desired channel number when this flag is 1. */ u8 bNotifyChannelChange; -/* pbuddystruct adapter is used only in two inteface case, (iface_nums =2 in struct dvobj_priv) */ +/* pbuddystruct adapter is used only in two interface case, (iface_nums =2 in struct dvobj_priv) */ /* PRIMARY ADAPTER's buddy is SECONDARY_ADAPTER */ /* SECONDARY_ADAPTER's buddy is PRIMARY_ADAPTER */ /* for iface_id > SECONDARY_ADAPTER(IFACE_ID1), refer to padapters[iface_id] in struct dvobj_priv */
drivers/staging/rtl8723bs/include/hal_com.h +1 -1
@@ -158,7 +158,7 @@ (rate ==DESC_RATEVHTSS2MCS6 ) ?"VHTSS2MCS6" : \ (rate ==DESC_RATEVHTSS2MCS7 ) ?"VHTSS2MCS7" : \ (rate ==DESC_RATEVHTSS2MCS8 ) ?"VHTSS2MCS8" : \ -(rate ==DESC_RATEVHTSS2MCS9 ) ?"VHTSS2MCS9" :"UNKNOW" +(rate ==DESC_RATEVHTSS2MCS9 ) ?"VHTSS2MCS9" :"UNKNOWN" enum{
drivers/staging/rtl8723bs/include/hal_com_reg.h +17 -17
@@ -768,14 +768,14 @@ Default: 00b.#define IMR_BCNDMAINT3 BIT28/* Beacon DMA Interrupt 3 */ #define IMR_BCNDMAINT2 BIT27/* Beacon DMA Interrupt 2 */ #define IMR_BCNDMAINT1 BIT26/* Beacon DMA Interrupt 1 */ -#define IMR_BCNDOK8 BIT25/* Beacon Queue DMA OK Interrup 8 */ -#define IMR_BCNDOK7 BIT24/* Beacon Queue DMA OK Interrup 7 */ -#define IMR_BCNDOK6 BIT23/* Beacon Queue DMA OK Interrup 6 */ -#define IMR_BCNDOK5 BIT22/* Beacon Queue DMA OK Interrup 5 */ -#define IMR_BCNDOK4 BIT21/* Beacon Queue DMA OK Interrup 4 */ -#define IMR_BCNDOK3 BIT20/* Beacon Queue DMA OK Interrup 3 */ -#define IMR_BCNDOK2 BIT19/* Beacon Queue DMA OK Interrup 2 */ -#define IMR_BCNDOK1 BIT18/* Beacon Queue DMA OK Interrup 1 */ +#define IMR_BCNDOK8 BIT25/* Beacon Queue DMA OK Interrupt 8 */ +#define IMR_BCNDOK7 BIT24/* Beacon Queue DMA OK Interrupt 7 */ +#define IMR_BCNDOK6 BIT23/* Beacon Queue DMA OK Interrupt 6 */ +#define IMR_BCNDOK5 BIT22/* Beacon Queue DMA OK Interrupt 5 */ +#define IMR_BCNDOK4 BIT21/* Beacon Queue DMA OK Interrupt 4 */ +#define IMR_BCNDOK3 BIT20/* Beacon Queue DMA OK Interrupt 3 */ +#define IMR_BCNDOK2 BIT19/* Beacon Queue DMA OK Interrupt 2 */ +#define IMR_BCNDOK1 BIT18/* Beacon Queue DMA OK Interrupt 1 */ #define IMR_TIMEOUT2 BIT17/* Timeout interrupt 2 */ #define IMR_TIMEOUT1 BIT16/* Timeout interrupt 1 */ #define IMR_TXFOVW BIT15/* Transmit FIFO Overflow */
@@ -784,9 +784,9 @@ Default: 00b.#define IMR_RXFOVW BIT12/* Receive FIFO Overflow */ #define IMR_RDU BIT11/* Receive Descriptor Unavailable */ #define IMR_ATIMEND BIT10/* For 92C, ATIM Window End Interrupt. For 8723 and later ICs, it also means P2P CTWin End interrupt. */ -#define IMR_BDOK BIT9/* Beacon Queue DMA OK Interrup */ +#define IMR_BDOK BIT9/* Beacon Queue DMA OK Interrupt */ #define IMR_HIGHDOK BIT8/* High Queue DMA OK Interrupt */ -#define IMR_TBDOK BIT7/* Transmit Beacon OK interrup */ +#define IMR_TBDOK BIT7/* Transmit Beacon OK interrupt */ #define IMR_MGNTDOK BIT6/* Management Queue DMA OK Interrupt */ #define IMR_TBDER BIT5/* For 92C, Transmit Beacon Error Interrupt */ #define IMR_BKDOK BIT4/* AC_BK DMA OK Interrupt */
@@ -956,13 +956,13 @@ Default: 00b.#define IMR_BCNDMAINT3_88E BIT23/* Beacon DMA Interrupt 3 */ #define IMR_BCNDMAINT2_88E BIT22/* Beacon DMA Interrupt 2 */ #define IMR_BCNDMAINT1_88E BIT21/* Beacon DMA Interrupt 1 */ -#define IMR_BCNDOK7_88E BIT20/* Beacon Queue DMA OK Interrup 7 */ -#define IMR_BCNDOK6_88E BIT19/* Beacon Queue DMA OK Interrup 6 */ -#define IMR_BCNDOK5_88E BIT18/* Beacon Queue DMA OK Interrup 5 */ -#define IMR_BCNDOK4_88E BIT17/* Beacon Queue DMA OK Interrup 4 */ -#define IMR_BCNDOK3_88E BIT16/* Beacon Queue DMA OK Interrup 3 */ -#define IMR_BCNDOK2_88E BIT15/* Beacon Queue DMA OK Interrup 2 */ -#define IMR_BCNDOK1_88E BIT14/* Beacon Queue DMA OK Interrup 1 */ +#define IMR_BCNDOK7_88E BIT20/* Beacon Queue DMA OK Interrupt 7 */ +#define IMR_BCNDOK6_88E BIT19/* Beacon Queue DMA OK Interrupt 6 */ +#define IMR_BCNDOK5_88E BIT18/* Beacon Queue DMA OK Interrupt 5 */ +#define IMR_BCNDOK4_88E BIT17/* Beacon Queue DMA OK Interrupt 4 */ +#define IMR_BCNDOK3_88E BIT16/* Beacon Queue DMA OK Interrupt 3 */ +#define IMR_BCNDOK2_88E BIT15/* Beacon Queue DMA OK Interrupt 2 */ +#define IMR_BCNDOK1_88E BIT14/* Beacon Queue DMA OK Interrupt 1 */ #define IMR_ATIMEND_E_88E BIT13/* ATIM Window End Extension for Win7 */ #define IMR_TXERR_88E BIT11/* Tx Error Flag Interrupt Status, write 1 clear. */ #define IMR_RXERR_88E BIT10/* Rx Error Flag INT Status, Write 1 clear */
drivers/staging/rtl8723bs/include/hal_data.h +1 -1
@@ -389,7 +389,7 @@ struct hal_com_data {u8 OutEpQueueSel;u8 OutEpNumber; -/* 2010/12/10 MH Add for USB aggreation mode dynamic shceme. */ +/* 2010/12/10 MH Add for USB aggregation mode dynamic scheme. */ bool UsbRxHighSpeedMode;/* 2010/11/22 MH Add for slim combo debug mode selective. */
drivers/staging/rtl8723bs/include/hal_pwr_seq.h +1 -1
@@ -14,7 +14,7 @@ 4: LPS--Low Power State 5: SUS--Suspend - The transision from different states are defined below + The transition from different states are defined belowTRANS_CARDEMU_TO_ACT TRANS_ACT_TO_CARDEMUTRANS_CARDEMU_TO_SUS
drivers/staging/rtl8723bs/include/rtw_cmd.h +3 -3
@@ -136,7 +136,7 @@ enum {RESET_SECURITYPRIV ,/* add for CONFIG_IEEE80211W, none 11w also can use */ FREE_ASSOC_RESOURCES ,/* add for CONFIG_IEEE80211W, none 11w also can use */ DM_IN_LPS_WK_CID , -DM_RA_MSK_WK_CID ,/* add for STA update RAMask when bandwith change. */ +DM_RA_MSK_WK_CID ,/* add for STA update RAMask when bandwidth change. */ BEAMFORMING_WK_CID ,LPS_CHANGE_DTIM_CID , BTINFO_WK_CID,
@@ -514,7 +514,7 @@ struct drvextra_cmd_parm {unsigned char *pbuf; }; -/*------------------- Below are used for RF/BB tunning ---------------------*/ +/*------------------- Below are used for RF/BB tuning ---------------------*/ struct getcountjudge_rsp {u8 count_judge[MAX_RATES_LENGTH ];
@@ -567,7 +567,7 @@ struct RunInThread_param { Result: 0x00: success -0x01: sucess, and check Response. +0x01: success, and check Response. 0x02: cmd ignored due to duplicated sequcne number 0x03: cmd dropped due to invalid cmd code 0x04: reserved.
drivers/staging/rtl8723bs/include/rtw_mlme.h +9 -9
@@ -57,11 +57,11 @@/* ifdef UNDER_MPTEST */ #define WIFI_MP_STATE 0x00010000 -#define WIFI_MP_CTX_BACKGROUND 0x00020000/* in continous tx background */ -#define WIFI_MP_CTX_ST 0x00040000/* in continous tx with single-tone */ -#define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000/* pending in continous tx background due to out of skb */ -#define WIFI_MP_CTX_CCK_HW 0x00100000/* in continous tx */ -#define WIFI_MP_CTX_CCK_CS 0x00200000/* in continous tx with carrier suppression */ +#define WIFI_MP_CTX_BACKGROUND 0x00020000/* in continuous tx background */ +#define WIFI_MP_CTX_ST 0x00040000/* in continuous tx with single-tone */ +#define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000/* pending in continuous tx background due to out of skb */ +#define WIFI_MP_CTX_CCK_HW 0x00100000/* in continuous tx */ +#define WIFI_MP_CTX_CCK_CS 0x00200000/* in continuous tx with carrier suppression */ #define WIFI_MP_LPBK_STATE 0x00400000/* endif */
@@ -168,7 +168,7 @@ struct tx_provdisc_req_info {u8 benable;/* This provision discovery request frame is trigger to send or not */ }; -struct rx_provdisc_req_info {/* When peer device issue prov_disc_req first, we should store the following informations */ +struct rx_provdisc_req_info {/* When peer device issue prov_disc_req first, we should store the following information */ u8 peerDevAddr[ETH_ALEN ];/* Peer device address */ u8 strconfig_method_desc_of_prov_disc_req[4 ];/* description for the config method located in the provisioning discovery request frame. */ /* The UI must know this information to know which config method the remote p2p device is requiring. */
@@ -177,7 +177,7 @@ struct rx_provdisc_req_info { /* When peer device issue prov_disc_req first, westruct tx_nego_req_info {u16 peer_channel_num[2 ];/* The channel number which the receiver stands. */ u8 peerDevAddr[ETH_ALEN ];/* Peer device address */ -u8 benable;/* This negoitation request frame is trigger to send or not */ +u8 benable;/* This negotiation request frame is trigger to send or not */ };struct group_id_info {
@@ -228,9 +228,9 @@ struct wifidirect_info {u8 profileindex;/* Used to point to the index of profileinfo array */ u8 peer_operating_ch;u8 find_phase_state_exchange_cnt; -u16 device_password_id_for_nego;/* The device password ID for group negotation */ +u16 device_password_id_for_nego;/* The device password ID for group negotiation */ u8 negotiation_dialog_token; -u8 nego_ssid[WLAN_SSID_MAXLEN ];/* SSID information for group negotitation */ +u8 nego_ssid[WLAN_SSID_MAXLEN ];/* SSID information for group negotiation */ u8 nego_ssidlen;u8 p2p_group_ssid[WLAN_SSID_MAXLEN ];u8 p2p_group_ssid_len;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
@@ -112,7 +112,7 @@ extern unsigned char WMM_PARA_OUI[];/* Note: */ /* We just add new channel plan when the new channel plan is different from any of the following */ /* channel plan. */ -/* If you just wnat to customize the acitions(scan period or join actions) about one of the channel plan, */ +/* If you just want to customize the actions(scan period or join actions) about one of the channel plan, */ /* customize them in rt_channel_info in the RT_CHANNEL_LIST. */ /* */ enum {
drivers/staging/rtl8723bs/include/rtw_mp.h +1 -1
@@ -101,7 +101,7 @@ struct mpt_context {/* For MP Tx Power index */ u8 TxPwrLevel[2 ];/* rf-A, rf-B */ u32 RegTxPwrLimit; -/* Content of RCR Regsiter for Mass Production Test. */ +/* Content of RCR Register for Mass Production Test. */ u32 MptRCR;/* true if we only receive packets with specific pattern. */ bool bMptFilterPattern;
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +1 -1
@@ -112,7 +112,7 @@ enum rt_rf_power_state {#define RT_RF_OFF_LEVL_FREE_FW BIT(4)/* FW free, re-download the FW */ #define RT_RF_OFF_LEVL_FW_32K BIT(5)/* FW in 32k */ #define RT_RF_PS_LEVEL_ALWAYS_ASPM BIT(6)/* Always enable ASPM and Clock Req in initialization. */ -#define RT_RF_LPS_DISALBE_2R BIT(30)/* When LPS is on, disable 2R if no packet is received or transmittd. */ +#define RT_RF_LPS_DISALBE_2R BIT(30)/* When LPS is on, disable 2R if no packet is received or transmitted. */ #define RT_RF_LPS_LEVEL_ASPM BIT(31)/* LPS with ASPM */ #define RT_IN_PS_LEVEL (ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ? true : false)
drivers/staging/rtl8723bs/include/rtw_recv.h +2 -2
@@ -132,7 +132,7 @@ struct rx_pkt_attrib {u8 order;u8 privacy;/* in frame_ctrl field */ u8 bdecrypted; -u8 encrypt;/* when 0 indicate no encrypt. when non-zero, indicate the encrypt algorith */ +u8 encrypt;/* when 0 indicates no encryption; when non-zero, indicates the encryption algorithm */ u8 iv_len;u8 icv_len;u8 crc_err;
@@ -227,7 +227,7 @@ struct recv_priv {struct __queue recv_buf_pending_queue; -/* For display the phy informatiom */ +/* For display the phy information */ u8 is_signal_dbg;/* for debug */ u8 signal_strength_dbg;/* for debug */
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -142,7 +142,7 @@ struct pkt_attrib {u32 pktlen;/* the original 802.3 pkt raw_data len (not include ether_hdr data) */ u32 last_txcmdsz;u8 nr_frags; -u8 encrypt;/* when 0 indicate no encrypt. when non-zero, indicate the encrypt algorith */ +u8 encrypt;/* when 0 indicates no encryption; when non-zero, indicates the encryption algorithm */ u8 iv_len;u8 icv_len;u8 iv[18 ];
drivers/staging/rtl8723bs/include/sta_info.h +1 -1
@@ -329,7 +329,7 @@ struct sta_priv {*/ struct sta_info *sta_aid[NUM_STA ]; -u16 sta_dz_bitmap;/* only support 15 stations, staion aid bitmap for sleeping sta. */ +u16 sta_dz_bitmap;/* only support for 15 stations, aid bitmap for sleeping stations. */ u16 tim_bitmap;/* only support 15 stations, aid = 0~15 mapping bit0~bit15 */ u16 max_num_sta;
drivers/staging/rtl8723bs/include/wifi.h +1 -1
@@ -678,7 +678,7 @@ struct ADDBA_request {#define P2P_PROVISION_TIMEOUT 5000/* 5 seconds timeout for sending the provision discovery request */ #define P2P_CONCURRENT_PROVISION_TIMEOUT 3000/* 3 seconds timeout for sending the provision discovery request under concurrent mode */ -#define P2P_GO_NEGO_TIMEOUT 5000/* 5 seconds timeout for receiving the group negotation response */ +#define P2P_GO_NEGO_TIMEOUT 5000/* 5 seconds timeout for receiving the group negotiation response */ #define P2P_CONCURRENT_GO_NEGO_TIMEOUT 3000/* 3 seconds timeout for sending the negotiation request under concurrent mode */ #define P2P_TX_PRESCAN_TIMEOUT 100/* 100ms */ #define P2P_INVITE_TIMEOUT 5000/* 5 seconds timeout for sending the invitation request */
Signature · 1 line
2.31.1
PATCH v4 3/4 staging: rtl8723bs: include: Change the type of a variable
In reply to Fabio M. De FrancescoChange the type of fw_current_in_ps_mode from u8 to bool, because it is used everywhere as a bool and, accordingly, it should be declared as a bool.
---
Changes from v3: Move changes of controlling expressions in patch 4/4. Changes from v2: Rewrite subject in patch 0/4; remove a patch from the series because it had alreay been applied (rtl8723bs: core: Remove an unused variable). Changes from v1: Fix a typo in subject of patch 1/5, add patch 5/5.
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +1 -1
@@ -203,7 +203,7 @@ struct pwrctrl_priv {u8 LpsIdleCount;u8 power_mgnt;u8 org_power_mgnt; -u8 fw_current_in_ps_mode; +bool fw_current_in_ps_mode;unsigned long DelayLPSLastTimeStamp;s32 pnp_current_pwr_state;u8 pnp_bstop_trx;
Signature · 1 line
2.31.1
PATCH v4 4/4 staging: rtl8723bs: Change controlling expressions
In reply to Fabio M. De FrancescoChange controlling expressions within 'if' statements: don't compare with 'true'.
---
Changes from v3: Move changes of controlling expressions in patch 4/4. Changes from v2: Rewrite subject in patch 0/4; remove a patch from the series because it had alreay been applied (rtl8723bs: core: Remove an unused variable). Changes from v1: Fix a typo in subject of patch 1/5, add patch 5/5.
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1507,7 +1507,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)if (pwrpriv->dtim != dtim) pwrpriv->dtim = dtim; -if ((pwrpriv->fw_current_in_ps_mode == true) && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) { +if (pwrpriv->fw_current_in_ps_mode && (pwrpriv->pwr_mode >PS_MODE_ACTIVE )) {u8 ps_mode = pwrpriv->pwr_mode;rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode));
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -1
@@ -348,7 +348,7 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)void rtw_hal_dm_watchdog_in_lps (struct adapter *padapter) { -if (adapter_to_pwrctl (padapter)->fw_current_in_ps_mode == true) { +if (adapter_to_pwrctl (padapter)->fw_current_in_ps_mode) {if (padapter->HalFunc.hal_dm_watchdog_in_lps) padapter->HalFunc.hal_dm_watchdog_in_lps (padapter);/* this function caller is in interrupt context */ }
Signature · 1 line
2.31.1