|
@@ -147,7 +147,7 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val,
|
|
|
}
|
|
|
if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) {
|
|
|
rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,
|
|
|
- (u8 *)(&rpwm_val));
|
|
|
+ &rpwm_val);
|
|
|
if (FW_PS_IS_ACK(rpwm_val)) {
|
|
|
isr_regaddr = REG_HISR;
|
|
|
content = rtl_read_dword(rtlpriv, isr_regaddr);
|
|
@@ -221,7 +221,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val)
|
|
|
rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);
|
|
|
rtl_write_word(rtlpriv, REG_HISR, 0x0100);
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
|
|
|
- (u8 *)(&rpwm_val));
|
|
|
+ &rpwm_val);
|
|
|
spin_lock_bh(&rtlpriv->locks.fw_ps_lock);
|
|
|
rtlhal->fw_clk_change_in_progress = false;
|
|
|
spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
|
|
@@ -253,15 +253,14 @@ static void _rtl8723be_fwlps_leave(struct ieee80211_hw *hw)
|
|
|
_rtl8723be_set_fw_clock_on(hw, rpwm_val, false);
|
|
|
rtlhal->allow_sw_to_change_hwclc = false;
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
|
|
|
- (u8 *)(&fw_pwrmode));
|
|
|
+ &fw_pwrmode);
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
|
|
|
(u8 *)(&fw_current_inps));
|
|
|
} else {
|
|
|
rpwm_val = FW_PS_STATE_ALL_ON_88E; /* RF on */
|
|
|
- rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
|
|
|
- (u8 *)(&rpwm_val));
|
|
|
+ rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
|
|
|
- (u8 *)(&fw_pwrmode));
|
|
|
+ &fw_pwrmode);
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
|
|
|
(u8 *)(&fw_current_inps));
|
|
|
}
|
|
@@ -280,7 +279,7 @@ static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw)
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
|
|
|
(u8 *)(&fw_current_inps));
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
|
|
|
- (u8 *)(&ppsc->fwctrl_psmode));
|
|
|
+ &ppsc->fwctrl_psmode);
|
|
|
rtlhal->allow_sw_to_change_hwclc = true;
|
|
|
_rtl8723be_set_fw_clock_off(hw, rpwm_val);
|
|
|
|
|
@@ -289,9 +288,8 @@ static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw)
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
|
|
|
(u8 *)(&fw_current_inps));
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
|
|
|
- (u8 *)(&ppsc->fwctrl_psmode));
|
|
|
- rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
|
|
|
- (u8 *)(&rpwm_val));
|
|
|
+ &ppsc->fwctrl_psmode);
|
|
|
+ rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -400,12 +398,12 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
|
|
|
for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
|
|
|
- (u8 *)(&e_aci));
|
|
|
+ &e_aci);
|
|
|
}
|
|
|
break; }
|
|
|
case HW_VAR_ACK_PREAMBLE: {
|
|
|
u8 reg_tmp;
|
|
|
- u8 short_preamble = (bool) (*(u8 *)val);
|
|
|
+ u8 short_preamble = (bool)*val;
|
|
|
reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL + 2);
|
|
|
if (short_preamble) {
|
|
|
reg_tmp |= 0x02;
|
|
@@ -416,13 +414,13 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
}
|
|
|
break; }
|
|
|
case HW_VAR_WPA_CONFIG:
|
|
|
- rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));
|
|
|
+ rtl_write_byte(rtlpriv, REG_SECCFG, *val);
|
|
|
break;
|
|
|
case HW_VAR_AMPDU_MIN_SPACE: {
|
|
|
u8 min_spacing_to_set;
|
|
|
u8 sec_min_space;
|
|
|
|
|
|
- min_spacing_to_set = *((u8 *)val);
|
|
|
+ min_spacing_to_set = *val;
|
|
|
if (min_spacing_to_set <= 7) {
|
|
|
sec_min_space = 0;
|
|
|
|
|
@@ -445,7 +443,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
case HW_VAR_SHORTGI_DENSITY: {
|
|
|
u8 density_to_set;
|
|
|
|
|
|
- density_to_set = *((u8 *)val);
|
|
|
+ density_to_set = *val;
|
|
|
mac->min_space_cfg |= (density_to_set << 3);
|
|
|
|
|
|
RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
|
|
@@ -463,7 +461,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
|
|
|
p_regtoset = regtoset_normal;
|
|
|
|
|
|
- factor_toset = *((u8 *)val);
|
|
|
+ factor_toset = *val;
|
|
|
if (factor_toset <= 3) {
|
|
|
factor_toset = (1 << (factor_toset + 2));
|
|
|
if (factor_toset > 0xf)
|
|
@@ -491,15 +489,15 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
}
|
|
|
break; }
|
|
|
case HW_VAR_AC_PARAM: {
|
|
|
- u8 e_aci = *((u8 *)val);
|
|
|
+ u8 e_aci = *val;
|
|
|
rtl8723_dm_init_edca_turbo(hw);
|
|
|
|
|
|
if (rtlpci->acm_method != EACMWAY2_SW)
|
|
|
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
|
|
|
- (u8 *)(&e_aci));
|
|
|
+ &e_aci);
|
|
|
break; }
|
|
|
case HW_VAR_ACM_CTRL: {
|
|
|
- u8 e_aci = *((u8 *)val);
|
|
|
+ u8 e_aci = *val;
|
|
|
union aci_aifsn *p_aci_aifsn =
|
|
|
(union aci_aifsn *)(&(mac->ac[0].aifs));
|
|
|
u8 acm = p_aci_aifsn->f.acm;
|
|
@@ -552,7 +550,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
rtlpci->receive_config = ((u32 *)(val))[0];
|
|
|
break;
|
|
|
case HW_VAR_RETRY_LIMIT: {
|
|
|
- u8 retry_limit = ((u8 *)(val))[0];
|
|
|
+ u8 retry_limit = *val;
|
|
|
|
|
|
rtl_write_word(rtlpriv, REG_RL,
|
|
|
retry_limit << RETRY_LIMIT_SHORT_SHIFT |
|
|
@@ -565,7 +563,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
rtlefuse->efuse_usedbytes = *((u16 *)val);
|
|
|
break;
|
|
|
case HW_VAR_EFUSE_USAGE:
|
|
|
- rtlefuse->efuse_usedpercentage = *((u8 *)val);
|
|
|
+ rtlefuse->efuse_usedpercentage = *val;
|
|
|
break;
|
|
|
case HW_VAR_IO_CMD:
|
|
|
rtl8723be_phy_set_io_cmd(hw, (*(enum io_type *)val));
|
|
@@ -577,14 +575,13 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
udelay(1);
|
|
|
|
|
|
if (rpwm_val & BIT(7)) {
|
|
|
- rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, (*(u8 *)val));
|
|
|
+ rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);
|
|
|
} else {
|
|
|
- rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
|
|
|
- ((*(u8 *)val) | BIT(7)));
|
|
|
+ rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7));
|
|
|
}
|
|
|
break; }
|
|
|
case HW_VAR_H2C_FW_PWRMODE:
|
|
|
- rtl8723be_set_fw_pwrmode_cmd(hw, (*(u8 *)val));
|
|
|
+ rtl8723be_set_fw_pwrmode_cmd(hw, *val);
|
|
|
break;
|
|
|
case HW_VAR_FW_PSMODE_STATUS:
|
|
|
ppsc->fw_current_inpsmode = *((bool *)val);
|
|
@@ -602,7 +599,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
|
|
|
break; }
|
|
|
case HW_VAR_H2C_FW_JOINBSSRPT: {
|
|
|
- u8 mstatus = (*(u8 *)val);
|
|
|
+ u8 mstatus = *val;
|
|
|
u8 tmp_regcr, tmp_reg422, bcnvalid_reg;
|
|
|
u8 count = 0, dlbcn_count = 0;
|
|
|
bool recover = false;
|
|
@@ -657,10 +654,10 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
rtl_write_byte(rtlpriv, REG_CR + 1,
|
|
|
(tmp_regcr & ~(BIT(0))));
|
|
|
}
|
|
|
- rtl8723be_set_fw_joinbss_report_cmd(hw, (*(u8 *)val));
|
|
|
+ rtl8723be_set_fw_joinbss_report_cmd(hw, *val);
|
|
|
break; }
|
|
|
case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:
|
|
|
- rtl8723be_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));
|
|
|
+ rtl8723be_set_p2p_ps_offload_cmd(hw, *val);
|
|
|
break;
|
|
|
case HW_VAR_AID: {
|
|
|
u16 u2btmp;
|
|
@@ -670,7 +667,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
(u2btmp | mac->assoc_id));
|
|
|
break; }
|
|
|
case HW_VAR_CORRECT_TSF: {
|
|
|
- u8 btype_ibss = ((u8 *)(val))[0];
|
|
|
+ u8 btype_ibss = *val;
|
|
|
|
|
|
if (btype_ibss)
|
|
|
_rtl8723be_stop_tx_beacon(hw);
|
|
@@ -690,7 +687,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
|
|
|
case HW_VAR_KEEP_ALIVE: {
|
|
|
u8 array[2];
|
|
|
array[0] = 0xff;
|
|
|
- array[1] = *((u8 *)val);
|
|
|
+ array[1] = *val;
|
|
|
rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_KEEP_ALIVE_CTRL,
|
|
|
2, array);
|
|
|
break; }
|