staging: r8188eu: SetHwReg8188EU() cleanups
cover staging: r8188eu: SetHwReg8188EU() cleanups
The next round of SetHwReg8188EU() cleanups. This series removes four cases from that unwanted function.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (4):
staging: r8188eu: remove HW_VAR_INITIAL_GAIN
staging: r8188eu: remove HW_VAR_MLME_JOIN
staging: r8188eu: remove HW_VAR_FIFO_CLEARN_UP
staging: r8188eu: remove HW_VAR_H2C_FW_PWRMODE
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 91 ++++++++++++++----- drivers/staging/r8188eu/core/rtw_p2p.c | 4 +- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 19 +++- drivers/staging/r8188eu/hal/usb_halinit.c | 80 ---------------- drivers/staging/r8188eu/include/hal_intf.h | 4 - drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 + drivers/staging/r8188eu/os_dep/os_intfs.c | 29 +++++- 7 files changed, 113 insertions(+), 115 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/4 staging: r8188eu: remove HW_VAR_INITIAL_GAIN
Remove the HW_VAR_INITIAL_GAIN case from SetHwReg8188EU() and move its functionality to a new static function in rtw_mlme_ext.c. This is part of the ongoing effort to get rid of the unwanted hal layer.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 30 ++++++++++++++------- drivers/staging/r8188eu/hal/usb_halinit.c | 13 --------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 21 insertions(+), 23 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +21 -9
@@ -5794,13 +5794,27 @@ Following are some utitity fuctions for WiFi MLME*****************************************************************************/ +static void rtw_set_initial_gain (struct adapter *adapter,u8 gain) +{ +struct hal_data_8188e *haldata = &adapter->haldata; +struct odm_dm_struct *odmpriv = &haldata->odmpriv; +struct rtw_dig *digtable = &odmpriv->DM_DigTable; + +if (gain ==0xff ) { +/* restore rx gain */ +ODM_Write_DIG (odmpriv, digtable->BackupIGValue); + }else { + digtable->BackupIGValue = digtable->CurIGValue; +ODM_Write_DIG (odmpriv, gain); + } +} +void site_survey (struct adapter *padapter) {unsigned char survey_channel =0 , val8;enum rt_scan_type ScanType =SCAN_PASSIVE ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -u32 initialgain =0 ;struct wifidirect_info *pwdinfo = &padapter->wdinfo;if ((pwdinfo->rx_invitereq_info.scan_op_ch_only) || (pwdinfo->p2p_info.scan_op_ch_only)) {
@@ -5878,8 +5892,8 @@ void site_survey(struct adapter *padapter)rtw_p2p_set_state (pwdinfo,P2P_STATE_FIND_PHASE_LISTEN ); pmlmeext->sitesurvey_res.state =SCAN_DISABLE ; - initialgain =0xff ;/* restore RX GAIN */ -SetHwReg8188EU (padapter,HW_VAR_INITIAL_GAIN , (u8 *)(&initialgain)); +/* restore RX GAIN */ +rtw_set_initial_gain (padapter,0xff );/* turn on dynamic functions */ Restore_DM_Func_Flag (padapter);/* Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, true); */
@@ -5912,8 +5926,8 @@ void site_survey(struct adapter *padapter)/* config MSR */ Set_MSR (padapter, (pmlmeinfo->state &0x3 )); - initialgain =0xff ;/* restore RX GAIN */ -SetHwReg8188EU (padapter,HW_VAR_INITIAL_GAIN , (u8 *)(&initialgain)); +/* restore RX GAIN */ +rtw_set_initial_gain (padapter,0xff );/* turn on dynamic functions */ Restore_DM_Func_Flag (padapter);/* Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); */
@@ -7369,7 +7383,6 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf;u8 bdelayscan = false;u8 val8; -u32 initialgain;u32 i;struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -7418,11 +7431,10 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)/* config the initial gain under scanning, need to write the BB registers */ if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE )) - initialgain =0x1E ; +rtw_set_initial_gain (padapter,0x1e );else - initialgain =0x28 ; +rtw_set_initial_gain (padapter,0x28 ); -SetHwReg8188EU (padapter,HW_VAR_INITIAL_GAIN , (u8 *)(&initialgain));/* set MSR to no link state */ Set_MSR (padapter, _HW_STATE_NOLINK_);
drivers/staging/r8188eu/hal/usb_halinit.c +0 -13
@@ -1146,19 +1146,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)rtl8188e_set_FwPwrMode_cmd (Adapter, psmode); }break ; -case HW_VAR_INITIAL_GAIN : - { -struct rtw_dig *pDigTable = &podmpriv->DM_DigTable; -u32 rx_gain = ((u32 *)(val))[0 ]; - -if (rx_gain ==0xff ) {/* restore rx gain */ -ODM_Write_DIG (podmpriv, pDigTable->BackupIGValue); - }else { - pDigTable->BackupIGValue = pDigTable->CurIGValue; -ODM_Write_DIG (podmpriv, rx_gain); - } - } -break ;case HW_VAR_FIFO_CLEARN_UP : {struct pwrctrl_priv *pwrpriv = &Adapter->pwrctrlpriv;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -22,7 +22,6 @@ enum hw_variables {HW_VAR_AC_PARAM_BE ,HW_VAR_AMPDU_FACTOR ,HW_VAR_H2C_FW_PWRMODE , -HW_VAR_INITIAL_GAIN ,HW_VAR_FIFO_CLEARN_UP , HW_VAR_H2C_MEDIA_STATUS_RPT, };
Signature · 1 line
2.35.1
PATCH 2/4 staging: r8188eu: remove HW_VAR_MLME_JOIN
In reply to Michael StraubeRemove the HW_VAR_MLME_JOIN case from SetHwReg8188EU() and move its functionality to a new static function in rtw_mlme_ext.c. This is part of the ongoing effort to get rid of the unwanted hal layer.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 61 ++++++++++++++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 30 ---------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 46 insertions(+), 46 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +46 -15
@@ -6110,10 +6110,50 @@ static void rtw_set_bssid(struct adapter *adapter, u8 *bssid)rtw_write8 (adapter,REG_BSSID + i, bssid[i]); } +static void mlme_join (struct adapter *adapter,int type) +{ +struct mlme_priv *mlmepriv = &adapter->mlmepriv; +u8 retry_limit =0x30 ; + +switch (type) { +case 0 : +/* prepare to join */ +/* enable to rx data frame, accept all data frame */ +rtw_write16 (adapter,REG_RXFLTMAP2 ,0xFFFF ); + +rtw_write32 (adapter,REG_RCR , +rtw_read32 (adapter,REG_RCR ) |RCR_CBSSID_DATA |RCR_CBSSID_BCN ); + +if (check_fwstate (mlmepriv,WIFI_STATION_STATE )) { + retry_limit =48 ; + }else { +/* ad-hoc mode */ + retry_limit =0x7 ; + } +break ; +case 1 : +/* joinbss_event call back when join res < 0 */ +rtw_write16 (adapter,REG_RXFLTMAP2 ,0x00 ); +break ; +case 2 : +/* sta add event call back */ +/* enable update TSF */ +rtw_write8 (adapter,REG_BCN_CTRL ,rtw_read8 (adapter,REG_BCN_CTRL ) & (~BIT (4 ))); + +if (check_fwstate (mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) + retry_limit =0x7 ; +break ; +default : +break ; + } + +rtw_write16 (adapter,REG_RL , + retry_limit <<RETRY_LIMIT_SHORT_SHIFT | retry_limit <<RETRY_LIMIT_LONG_SHIFT ); +} +void start_create_ibss (struct adapter *padapter) {unsigned short caps; -u8 join_type;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);
@@ -6145,8 +6185,7 @@ void start_create_ibss(struct adapter *padapter) pmlmeinfo->state =WIFI_FW_NULL_STATE ; }else {rtw_set_bssid (padapter, padapter->registrypriv.dev_network.MacAddress); - join_type =0 ; -SetHwReg8188EU (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); +mlme_join (padapter,0 );report_join_res (padapter,1 ); pmlmeinfo->state |=WIFI_FW_ASSOC_SUCCESS ;
@@ -6719,12 +6758,10 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv; -u8 join_type;u16 media_status;if (join_res <0 ) { - join_type =1 ; -SetHwReg8188EU (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); +mlme_join (padapter,1 );rtw_set_bssid (padapter, null_addr);/* restore to initial setting. */
@@ -6779,8 +6816,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)SetHwReg8188EU (padapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status); } - join_type =2 ; -SetHwReg8188EU (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); +mlme_join (padapter,2 );if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE ) {/* correcting TSF */
@@ -6793,7 +6829,6 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -u8 join_type;if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) {if (pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) {/* adhoc master or sta_count>1 */
@@ -6810,9 +6845,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p } pmlmeinfo->state |=WIFI_FW_ASSOC_SUCCESS ; } - - join_type =2 ; -SetHwReg8188EU (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); +mlme_join (padapter,2 ); } pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta;
@@ -7183,7 +7216,6 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)u8 join_cmd_hdl (struct adapter *padapter,u8 *pbuf) { -u8 join_type;struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -7281,8 +7313,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)/* config the initial gain under linking, need to write the BB registers */ rtw_set_bssid (padapter, pmlmeinfo->network.MacAddress); - join_type =0 ; -SetHwReg8188EU (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); +mlme_join (padapter,0 );/* cancel link timer */ _cancel_timer_ex (&pmlmeext->link_timer);
drivers/staging/r8188eu/hal/usb_halinit.c +0 -30
@@ -1036,36 +1036,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)rtw_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR ) |RCR_CBSSID_BCN ); }break ; -case HW_VAR_MLME_JOIN : - { -u8 RetryLimit =0x30 ; -u8 type = *((u8 *)val); -struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; - -if (type ==0 ) {/* prepare to join */ -/* enable to rx data frame.Accept all data frame */ -rtw_write16 (Adapter,REG_RXFLTMAP2 ,0xFFFF ); - -rtw_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR ) |RCR_CBSSID_DATA |RCR_CBSSID_BCN ); - -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) - RetryLimit =48 ; -else /* Ad-hoc Mode */ - RetryLimit =0x7 ; - }else if (type ==1 ) { -/* joinbss_event call back when join res < 0 */ -rtw_write16 (Adapter,REG_RXFLTMAP2 ,0x00 ); - }else if (type ==2 ) { -/* sta add event call back */ -/* enable update TSF */ -rtw_write8 (Adapter,REG_BCN_CTRL ,rtw_read8 (Adapter,REG_BCN_CTRL ) & (~BIT (4 ))); - -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) - RetryLimit =0x7 ; - } -rtw_write16 (Adapter,REG_RL , RetryLimit <<RETRY_LIMIT_SHORT_SHIFT | RetryLimit <<RETRY_LIMIT_LONG_SHIFT ); - } -break ;case HW_VAR_SLOT_TIME : {u8 u1bAIFS, aSifsTime;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -13,7 +13,6 @@ enum hw_variables {HW_VAR_BASIC_RATE ,HW_VAR_CORRECT_TSF ,HW_VAR_MLME_SITESURVEY , -HW_VAR_MLME_JOIN ,HW_VAR_SLOT_TIME ,HW_VAR_DM_FLAG , HW_VAR_DM_FUNC_OP,
Signature · 1 line
2.35.1
PATCH 3/4 staging: r8188eu: remove HW_VAR_FIFO_CLEARN_UP
In reply to Michael StraubeRemove the HW_VAR_FIFO_CLEARN_UP case from SetHwReg8188EU() and move its functionality to a new static function in os_intfs.c. This is part of the ongoing effort to get rid of the unwanted hal layer.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/hal/usb_halinit.c | 26 ------------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 29 +++++++++++++++++++++- 3 files changed, 28 insertions(+), 28 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -26
@@ -1116,32 +1116,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)rtl8188e_set_FwPwrMode_cmd (Adapter, psmode); }break ; -case HW_VAR_FIFO_CLEARN_UP : - { -struct pwrctrl_priv *pwrpriv = &Adapter->pwrctrlpriv; -u8 trycnt =100 ; - -/* pause tx */ -rtw_write8 (Adapter,REG_TXPAUSE ,0xff ); - -/* keep sn */ - Adapter->xmitpriv.nqos_ssn =rtw_read16 (Adapter,REG_NQOS_SEQ ); - -if (!pwrpriv->bkeepfwalive) { -/* RX DMA stop */ -rtw_write32 (Adapter,REG_RXPKT_NUM , (rtw_read32 (Adapter,REG_RXPKT_NUM ) |RW_RELEASE_EN )); -do { -if (!(rtw_read32 (Adapter,REG_RXPKT_NUM ) &RXDMA_IDLE )) -break ; - }while (trycnt--); - -/* RQPN Load 0 */ -rtw_write16 (Adapter,REG_RQPN_NPQ ,0x0 ); -rtw_write32 (Adapter,REG_RQPN ,0x80000000 ); -mdelay (10 ); - } - } -break ;case HW_VAR_H2C_MEDIA_STATUS_RPT :rtl8188e_set_FwMediaStatus_cmd (Adapter, (*(__le16 *)val));break ;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -21,7 +21,6 @@ enum hw_variables {HW_VAR_AC_PARAM_BE ,HW_VAR_AMPDU_FACTOR ,HW_VAR_H2C_FW_PWRMODE , -HW_VAR_FIFO_CLEARN_UP , HW_VAR_H2C_MEDIA_STATUS_RPT, };
drivers/staging/r8188eu/os_dep/os_intfs.c +28 -1
@@ -736,9 +736,36 @@ void rtw_ips_pwr_down(struct adapter *padapter) padapter->bCardDisableWOHSM = false; } +static void rtw_fifo_cleanup (struct adapter *adapter) +{ +struct pwrctrl_priv *pwrpriv = &adapter->pwrctrlpriv; +u8 trycnt =100 ; + +/* pause tx */ +rtw_write8 (adapter,REG_TXPAUSE ,0xff ); + +/* keep sn */ + adapter->xmitpriv.nqos_ssn =rtw_read16 (adapter,REG_NQOS_SEQ ); + +if (!pwrpriv->bkeepfwalive) { +/* RX DMA stop */ +rtw_write32 (adapter,REG_RXPKT_NUM , + (rtw_read32 (adapter,REG_RXPKT_NUM ) |RW_RELEASE_EN )); +do { +if (!(rtw_read32 (adapter,REG_RXPKT_NUM ) &RXDMA_IDLE )) +break ; + }while (trycnt--); + +/* RQPN Load 0 */ +rtw_write16 (adapter,REG_RQPN_NPQ ,0x0 ); +rtw_write32 (adapter,REG_RQPN ,0x80000000 ); +mdelay (10 ); + } +} +void rtw_ips_dev_unload (struct adapter *padapter) { -SetHwReg8188EU (padapter,HW_VAR_FIFO_CLEARN_UP ,NULL ); +rtw_fifo_cleanup (padapter);if (padapter->intf_stop) padapter->intf_stop (padapter);
Signature · 1 line
2.35.1
PATCH 4/4 staging: r8188eu: remove HW_VAR_H2C_FW_PWRMODE
In reply to Michael StraubeRemove the HW_VAR_H2C_FW_PWRMODE case from SetHwReg8188EU() and move its functionality to a new function in rtw_pwrctrl.c. This is part of the ongoing effort to get rid of the unwanted hal layer.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_p2p.c | 4 ++-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 19 +++++++++++++++---- drivers/staging/r8188eu/hal/usb_halinit.c | 11 ----------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 + 5 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_p2p.c +2 -2
@@ -1612,7 +1612,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (padapter->pwrctrlpriv.bFwCurrentInPSMode) {if (pwrpriv->smart_ps ==0 ) { pwrpriv->smart_ps =2 ; -SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); +rtw_set_firmware_ps_mode (padapter, pwrpriv->pwr_mode); } }break ;
@@ -1623,7 +1623,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (pwdinfo->ctwindow >0 ) {if (pwrpriv->smart_ps !=0 ) { pwrpriv->smart_ps =0 ; -SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); +rtw_set_firmware_ps_mode (padapter, pwrpriv->pwr_mode); } }rtl8188e_set_p2p_ps_offload_cmd (padapter, p2p_ps_state);
drivers/staging/r8188eu/core/rtw_pwrctrl.c +15 -4
@@ -176,6 +176,19 @@ static bool PS_RDY_CHECK(struct adapter *padapter)return true; } +void rtw_set_firmware_ps_mode (struct adapter *adapter,u8 mode) +{ +struct hal_data_8188e *haldata = &adapter->haldata; +struct odm_dm_struct *odmpriv = &haldata->odmpriv; + +/* Force leave RF low power mode for 1T1R to prevent +* conflicting setting in firmware power saving sequence. +*/ +if (mode !=PS_MODE_ACTIVE ) +ODM_RF_Saving (odmpriv, true); +rtl8188e_set_FwPwrMode_cmd (adapter, mode); +} +void rtw_set_ps_mode (struct adapter *padapter,u8 ps_mode,u8 smart_ps,u8 bcn_ant_mode) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@@ -193,11 +206,10 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_areturn ; } -/* if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) */ if (ps_mode ==PS_MODE_ACTIVE ) {if (pwdinfo->opp_ps ==0 ) { pwrpriv->pwr_mode = ps_mode; -SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); +rtw_set_firmware_ps_mode (padapter, ps_mode); pwrpriv->bFwCurrentInPSMode = false; } }else {
@@ -206,14 +218,13 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a pwrpriv->pwr_mode = ps_mode; pwrpriv->smart_ps = smart_ps; pwrpriv->bcn_ant_mode = bcn_ant_mode; -SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); +rtw_set_firmware_ps_mode (padapter, ps_mode);/* Set CTWindow after LPS */ if (pwdinfo->opp_ps ==1 )p2p_ps_wk_cmd (padapter,P2P_PS_ENABLE ,0 ); } } - }static bool lps_rf_on (struct adapter *adapter)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -11
@@ -1105,17 +1105,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) } }break ; -case HW_VAR_H2C_FW_PWRMODE : - { -u8 psmode = (*(u8 *)val); - -/* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */ -/* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */ -if (psmode !=PS_MODE_ACTIVE ) -ODM_RF_Saving (podmpriv, true); -rtl8188e_set_FwPwrMode_cmd (Adapter, psmode); - } -break ;case HW_VAR_H2C_MEDIA_STATUS_RPT :rtl8188e_set_FwMediaStatus_cmd (Adapter, (*(__le16 *)val));break ;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -20,7 +20,6 @@ enum hw_variables {HW_VAR_DM_FUNC_CLR ,HW_VAR_AC_PARAM_BE ,HW_VAR_AMPDU_FACTOR , -HW_VAR_H2C_FW_PWRMODE , HW_VAR_H2C_MEDIA_STATUS_RPT, };
drivers/staging/r8188eu/include/rtw_pwrctrl.h +1 -0
@@ -95,6 +95,7 @@ struct pwrctrl_priv {void rtw_init_pwrctrl_priv (struct adapter *adapter); +void rtw_set_firmware_ps_mode (struct adapter *adapter,u8 mode);void rtw_set_ps_mode (struct adapter *adapter,u8 ps_mode,u8 smart_ps,u8 bcn_ant_mode);void LeaveAllPowerSaveMode (struct adapter *adapter);
Signature · 1 line
2.35.1