skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-02-08 15:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_LPS

Browse source 
This symbol is defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-24 20:32:00 -06:00
parent e932bd9250
commit dae15933ce
13 changed files with 4 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/rtw_cmd.c
View file

@ -678,13 +678,9 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
;
#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) {
@ -2044,9 +2040,7 @@ exit:
static void traffic_status_watchdog(struct adapter *padapter) static void traffic_status_watchdog(struct adapter *padapter)
{ {
#ifdef CONFIG_LPS
u8 bEnterPS; u8 bEnterPS;
#endif
u16 BusyThreshold = 200;/* 100; */ u16 BusyThreshold = 200;/* 100; */
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;
@ -2134,7 +2128,6 @@ static void traffic_status_watchdog(struct adapter *padapter)
#endif /* CONFIG_TDLS_AUTOSETUP */ #endif /* CONFIG_TDLS_AUTOSETUP */
#endif /* CONFIG_TDLS */ #endif /* CONFIG_TDLS */
#ifdef CONFIG_LPS
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
if (BT_1Ant(padapter) == false) if (BT_1Ant(padapter) == false)
#endif #endif
@ -2161,13 +2154,10 @@ static void traffic_status_watchdog(struct 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;
@ -2218,9 +2208,6 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
#endif #endif
} }
#ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -2347,8 +2334,6 @@ exit:
} }
#endif
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime) static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime)
{ {
@ -2790,11 +2775,9 @@ u8 rtw_drvextra_cmd_hdl(struct 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);

16
core/rtw_ioctl_set.c
View file

@ -338,8 +338,7 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
("Set SSID is the same ssid, fw_state=0x%08x\n", ("Set SSID is the same ssid, fw_state=0x%08x\n",
get_fwstate(pmlmepriv))); get_fwstate(pmlmepriv)));
if(rtw_is_same_ibss(padapter, pnetwork) == false) if(rtw_is_same_ibss(padapter, pnetwork) == false) {
{
/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ /* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */
rtw_disassoc_cmd(padapter, 0, true); rtw_disassoc_cmd(padapter, 0, true);
@ -352,20 +351,13 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
_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));

4
core/rtw_mlme.c
View file

@ -1488,11 +1488,7 @@ void rtw_indicate_disconnect( struct adapter *padapter )
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
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
#endif
;
} }
inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted) inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted)

3
core/rtw_mlme_ext.c
View file

@ -9606,10 +9606,7 @@ void mlmeext_joinbss_event_callback(struct 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:

8
core/rtw_pwrctrl.c
View file

@ -322,7 +322,6 @@ static void pwr_state_check_handler(void *FunctionContext)
rtw_ps_cmd(padapter); rtw_ps_cmd(padapter);
} }
#ifdef CONFIG_LPS
/* /*
* *
* Parameters * Parameters
@ -704,12 +703,7 @@ void LPS_Leave(struct adapter *padapter)
} }
pwrpriv->bpower_saving = false; pwrpriv->bpower_saving = false;
/* DBG_871X("-LeisurePSLeave\n"); */
;
} }
#endif
/* */ /* */
/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */ /* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
@ -729,9 +723,7 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
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_to_pwrctl(Adapter)->rf_pwrstate== rf_off) if(adapter_to_pwrctl(Adapter)->rf_pwrstate== rf_off)
{ {

2
core/rtw_xmit.c
View file

@ -683,7 +683,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
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. */
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT
if ( (pattrib->ether_type == 0x88B4) || (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) ) if ( (pattrib->ether_type == 0x88B4) || (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
@ -693,7 +692,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
{ {
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

@ -1226,9 +1226,7 @@ odm_DIGbyRSSI_LPS(
return; return;
CurrentIGI=CurrentIGI+RSSI_OFFSET_DIG; CurrentIGI=CurrentIGI+RSSI_OFFSET_DIG;
#ifdef CONFIG_LPS
bFwCurrentInPSMode = adapter_to_pwrctl(pAdapter)->bFwCurrentInPSMode; bFwCurrentInPSMode = adapter_to_pwrctl(pAdapter)->bFwCurrentInPSMode;
#endif
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("==>pDM_Odm->RSSI_Min=%d ()\n",pDM_Odm->RSSI_Min)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("==>pDM_Odm->RSSI_Min=%d ()\n",pDM_Odm->RSSI_Min));

2
hal/rtl8188e_dm.c
View file

@ -308,10 +308,8 @@ rtl8188e_HalDmWatchDog(
if (hw_init_completed == false) if (hw_init_completed == false)
goto skip_dm; goto skip_dm;
#ifdef CONFIG_LPS
bFwCurrentInPSMode = adapter_to_pwrctl(Adapter)->bFwCurrentInPSMode; bFwCurrentInPSMode = adapter_to_pwrctl(Adapter)->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

@ -32,8 +32,6 @@
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#define CONFIG_LPS
//befor link //befor link
#define CONFIG_ANTENNA_DIVERSITY #define CONFIG_ANTENNA_DIVERSITY

2
include/rtw_pwrctrl.h
View file

@ -314,11 +314,9 @@ int autoresume_enter(struct adapter* padapter);
#endif #endif
rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ); rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter );
#ifdef CONFIG_LPS
s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms); s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms);
void LPS_Enter(struct adapter *padapter); void LPS_Enter(struct adapter *padapter);
void LPS_Leave(struct adapter *padapter); void LPS_Leave(struct adapter *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

@ -3035,11 +3035,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;
} }

13
os_dep/ioctl_linux.c
View file

@ -8213,9 +8213,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev,
rtw_stop_drv_threads(padapter); rtw_stop_drv_threads(padapter);
padapter->bDriverStopped = false; /* for 32k command */ padapter->bDriverStopped = false; /* for 32k command */
#ifdef CONFIG_LPS
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0);
#endif
rtw_hal_disable_interrupt(padapter); /* It need wait for leaving 32K. */ rtw_hal_disable_interrupt(padapter); /* It need wait for leaving 32K. */
/* 2.1 clean interupt */ /* 2.1 clean interupt */
@ -8226,9 +8224,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev,
rtw_hal_set_hwreg(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); rtw_hal_set_hwreg(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam);
} else if (_rtw_memcmp( extra, "disable", 6 )) { } else if (_rtw_memcmp( extra, "disable", 6 )) {
#ifdef CONFIG_LPS
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0); rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0);
#endif /* CONFIG_LPS */
pwrctrlpriv->bFwCurrentInPSMode = false; pwrctrlpriv->bFwCurrentInPSMode = false;
rtw_hal_disable_interrupt(padapter); rtw_hal_disable_interrupt(padapter);
@ -8344,10 +8340,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
ips_mode = pwrctrlpriv->ips_mode;/* keep org value */ ips_mode = pwrctrlpriv->ips_mode;/* keep org value */
rtw_pm_set_ips(padapter,IPS_NONE); rtw_pm_set_ips(padapter,IPS_NONE);
@ -8834,9 +8828,7 @@ exit:
wrqu->length = strlen(extra); wrqu->length = strlen(extra);
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#ifdef CONFIG_LPS
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
#endif
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
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 */
#endif #endif
@ -8895,10 +8887,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
ips_mode = pwrctrlpriv->ips_mode;/* keep org value */ ips_mode = pwrctrlpriv->ips_mode;/* keep org value */
rtw_pm_set_ips(padapter,IPS_NONE); rtw_pm_set_ips(padapter,IPS_NONE);
@ -9279,10 +9269,7 @@ exit:
rtw_mfree(setrawdata, EFUSE_MAX_SIZE); rtw_mfree(setrawdata, EFUSE_MAX_SIZE);
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#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

@ -592,10 +592,8 @@ int rtw_hw_suspend(struct 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
} }
} }