skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 14:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_LPS

Browse source 
This parameter is defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-19 21:25:11 -05:00
parent 5fc5fdc06a
commit 167e245287
13 changed files with 3 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/rtw_cmd.c
View file

@ -656,11 +656,9 @@ u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
_func_enter_; _func_enter_;
#ifdef CONFIG_LPS
if (check_fwstate(pmlmepriv, _FW_LINKED) == true){ if (check_fwstate(pmlmepriv, _FW_LINKED) == true){
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
} }
#endif
#ifdef CONFIG_P2P_PS #ifdef CONFIG_P2P_PS
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
@ -1853,9 +1851,7 @@ u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option)
static void traffic_status_watchdog(_adapter *padapter) static void traffic_status_watchdog(_adapter *padapter)
{ {
#ifdef CONFIG_LPS
u8 bEnterPS; u8 bEnterPS;
#endif
u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false; u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false; u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
#ifdef CONFIG_FTP_PROTECT #ifdef CONFIG_FTP_PROTECT
@ -1914,7 +1910,6 @@ static void traffic_status_watchdog(_adapter *padapter)
} }
#endif /* CONFIG_KEEP_FTP_TRANSMIT */ #endif /* CONFIG_KEEP_FTP_TRANSMIT */
#ifdef CONFIG_LPS
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
if (BT_1Ant(padapter) == false) if (BT_1Ant(padapter) == false)
#endif #endif
@ -1941,13 +1936,10 @@ static void traffic_status_watchdog(_adapter *padapter)
LPS_Leave(padapter); LPS_Leave(padapter);
} }
} }
#endif /* CONFIG_LPS */
} }
else else
{ {
#ifdef CONFIG_LPS
LPS_Leave(padapter); LPS_Leave(padapter);
#endif
} }
pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0; pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0;
@ -1987,8 +1979,6 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
#endif #endif
} }
#ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -2122,8 +2112,6 @@ _func_exit_;
} }
#endif
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime) static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
{ {
@ -2507,11 +2495,9 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
case POWER_SAVING_CTRL_WK_CID: case POWER_SAVING_CTRL_WK_CID:
power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
break; break;
#ifdef CONFIG_LPS
case LPS_CTRL_WK_CID: case LPS_CTRL_WK_CID:
lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size); lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);
break; break;
#endif
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
case RTP_TIMER_CFG_WK_CID: case RTP_TIMER_CFG_WK_CID:
rpt_timer_setting_wk_hdl(padapter, pdrvextra_cmd->type_size); rpt_timer_setting_wk_hdl(padapter, pdrvextra_cmd->type_size);

13
core/rtw_ioctl_set.c
View file

@ -336,20 +336,13 @@ _func_enter_;
_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
} }
} } else {
else
{
goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */
} }
} } else {
#ifdef CONFIG_LPS
else {
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_JOINBSS, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_JOINBSS, 1);
} }
#endif } else {
}
else
{
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set SSID not the same ssid\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set SSID not the same ssid\n"));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength));
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength));

2
core/rtw_mlme.c
View file

@ -1296,12 +1296,10 @@ _func_enter_;
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
#endif /* CONFIG_P2P_PS */ #endif /* CONFIG_P2P_PS */
#ifdef CONFIG_LPS
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (padapter->pwrctrlpriv.wowlan_mode==false) if (padapter->pwrctrlpriv.wowlan_mode==false)
#endif /* CONFIG_WOWLAN */ #endif /* CONFIG_WOWLAN */
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
#endif
_func_exit_; _func_exit_;
} }

3
core/rtw_mlme_ext.c
View file

@ -9102,10 +9102,7 @@ void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res)
/* set_link_timer(pmlmeext, DISCONNECT_TO); */ /* set_link_timer(pmlmeext, DISCONNECT_TO); */
} }
#ifdef CONFIG_LPS
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0);
#endif
exit_mlmeext_joinbss_event_callback: exit_mlmeext_joinbss_event_callback:

7
core/rtw_pwrctrl.c
View file

@ -330,9 +330,6 @@ void pwr_state_check_handler(void *FunctionContext)
rtw_ps_cmd(padapter); rtw_ps_cmd(padapter);
} }
#ifdef CONFIG_LPS
/* /*
* *
* Parameters * Parameters
@ -621,7 +618,6 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
#endif
/* */ /* */
/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */ /* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
@ -640,10 +636,7 @@ _func_enter_;
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue); p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
#endif /* CONFIG_P2P_PS */ #endif /* CONFIG_P2P_PS */
#ifdef CONFIG_LPS
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue); rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
#endif
} else { } else {
if (Adapter->pwrctrlpriv.rf_pwrstate== rf_off) if (Adapter->pwrctrlpriv.rf_pwrstate== rf_off)
{ {

2
core/rtw_xmit.c
View file

@ -627,11 +627,9 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
rtw_set_scan_deny(padapter, 3000); rtw_set_scan_deny(padapter, 3000);
} }
#ifdef CONFIG_LPS
/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ /* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
if ( (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) ) if ( (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
#endif
bmcast = IS_MCAST(pattrib->ra); bmcast = IS_MCAST(pattrib->ra);

2
hal/odm.c
View file

@ -1231,9 +1231,7 @@ odm_DIGbyRSSI_LPS(
return; return;
CurrentIGI=CurrentIGI+RSSI_OFFSET_DIG; CurrentIGI=CurrentIGI+RSSI_OFFSET_DIG;
#ifdef CONFIG_LPS
bFwCurrentInPSMode = pAdapter->pwrctrlpriv.bFwCurrentInPSMode; bFwCurrentInPSMode = pAdapter->pwrctrlpriv.bFwCurrentInPSMode;
#endif
/* Using FW PS mode to make IGI */ /* Using FW PS mode to make IGI */
if (bFwCurrentInPSMode) if (bFwCurrentInPSMode)

2
hal/rtl8188e_dm.c
View file

@ -274,10 +274,8 @@ rtl8188e_HalDmWatchDog(
if (hw_init_completed == false) if (hw_init_completed == false)
goto skip_dm; goto skip_dm;
#ifdef CONFIG_LPS
bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode; bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake));
#endif
#ifdef CONFIG_P2P_PS #ifdef CONFIG_P2P_PS
/* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */ /* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */

2
include/autoconf.h
View file

@ -51,8 +51,6 @@
#define CONFIG_IPS #define CONFIG_IPS
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_LPS
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
#ifdef CONFIG_INTERRUPT_BASED_TXBCN #ifdef CONFIG_INTERRUPT_BASED_TXBCN

3
include/rtw_pwrctrl.h
View file

@ -296,12 +296,9 @@ int autoresume_enter(_adapter* padapter);
rt_rf_power_state RfOnOffDetect( PADAPTER pAdapter ); rt_rf_power_state RfOnOffDetect( PADAPTER pAdapter );
#endif #endif
#ifdef CONFIG_LPS
s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms); s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms);
void LPS_Enter(PADAPTER padapter); void LPS_Enter(PADAPTER padapter);
void LPS_Leave(PADAPTER padapter); void LPS_Leave(PADAPTER padapter);
#endif
#ifdef CONFIG_RESUME_IN_WORKQUEUE #ifdef CONFIG_RESUME_IN_WORKQUEUE
void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv); void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv);

3
os_dep/ioctl_cfg80211.c
View file

@ -2565,11 +2565,8 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy,
rtw_wdev_priv->power_mgmt = enabled; rtw_wdev_priv->power_mgmt = enabled;
#ifdef CONFIG_LPS
if (!enabled) if (!enabled)
LPS_Leave(padapter); LPS_Leave(padapter);
#endif
return 0; return 0;
} }

8
os_dep/ioctl_linux.c
View file

@ -7844,10 +7844,8 @@ static int rtw_mp_efuse_get(struct net_device *dev,
err = -EFAULT; err = -EFAULT;
goto exit; goto exit;
} }
#ifdef CONFIG_LPS
lps_mode = pwrctrlpriv->power_mgnt;//keep org value lps_mode = pwrctrlpriv->power_mgnt;//keep org value
rtw_pm_set_lps(padapter,PS_MODE_ACTIVE); rtw_pm_set_lps(padapter,PS_MODE_ACTIVE);
#endif
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
ips_mode = pwrctrlpriv->ips_mode;//keep org value ips_mode = pwrctrlpriv->ips_mode;//keep org value
@ -8267,9 +8265,7 @@ exit:
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#endif #endif
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
#endif
padapter->registrypriv.fw_iol = org_fw_iol;// 0:Disable, 1:enable, 2:by usb speed padapter->registrypriv.fw_iol = org_fw_iol;// 0:Disable, 1:enable, 2:by usb speed
return err; return err;
} }
@ -8320,10 +8316,8 @@ static int rtw_mp_efuse_set(struct net_device *dev,
goto exit; goto exit;
} }
#ifdef CONFIG_LPS
lps_mode = pwrctrlpriv->power_mgnt;//keep org value lps_mode = pwrctrlpriv->power_mgnt;//keep org value
rtw_pm_set_lps(padapter,PS_MODE_ACTIVE); rtw_pm_set_lps(padapter,PS_MODE_ACTIVE);
#endif
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
ips_mode = pwrctrlpriv->ips_mode;//keep org value ips_mode = pwrctrlpriv->ips_mode;//keep org value
@ -8692,9 +8686,7 @@ exit:
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#endif #endif
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
#endif
return err; return err;
} }

2
os_dep/usb_intf.c
View file

@ -542,10 +542,8 @@ int rtw_hw_suspend(_adapter *padapter )
rtw_os_indicate_disconnect(padapter); rtw_os_indicate_disconnect(padapter);
#ifdef CONFIG_LPS
//donnot enqueue cmd //donnot enqueue cmd
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0);
#endif
} }
} }