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

rtl8188eu: Remove CONFIG_IPS

Browse source 
This one is selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-19 22:26:35 -05:00
parent 34d1182272
commit 5656471ac2
8 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/rtw_pwrctrl.c
View file

@ -29,7 +29,6 @@
#include <rtl8723a_hal.h> #include <rtl8723a_hal.h>
#endif #endif
#ifdef CONFIG_IPS
void ips_enter(_adapter * padapter) void ips_enter(_adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -127,9 +126,6 @@ int ips_leave(_adapter * padapter)
return result; return result;
} }
#endif
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
extern void autosuspend_enter(_adapter* padapter); extern void autosuspend_enter(_adapter* padapter);
extern int autoresume_enter(_adapter* padapter); extern int autoresume_enter(_adapter* padapter);
@ -312,9 +308,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
#endif /* defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) */ #endif /* defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) */
#ifdef CONFIG_IPS
ips_enter(padapter); ips_enter(padapter);
#endif
} }
} }
exit: exit:
@ -323,7 +317,6 @@ exit:
return; return;
} }
void pwr_state_check_handler(void *FunctionContext);
void pwr_state_check_handler(void *FunctionContext) void pwr_state_check_handler(void *FunctionContext)
{ {
_adapter *padapter = (_adapter *)FunctionContext; _adapter *padapter = (_adapter *)FunctionContext;
@ -869,7 +862,6 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
else else
#endif #endif
{ {
#ifdef CONFIG_IPS
DBG_88E("%s call ips_leave....\n",__func__); DBG_88E("%s call ips_leave....\n",__func__);
if (_FAIL == ips_leave(padapter)) if (_FAIL == ips_leave(padapter))
{ {
@ -877,7 +869,6 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
#endif
} }
} }

2
hal/rtl8188e_sreset.c
View file

@ -144,10 +144,8 @@ void rtl8188e_silentreset_for_specific_platform(_adapter *padapter)
_enter_critical_mutex(&psrtpriv->silentreset_mutex, &irqL); _enter_critical_mutex(&psrtpriv->silentreset_mutex, &irqL);
psrtpriv->silent_reset_inprogress = true; psrtpriv->silent_reset_inprogress = true;
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
#ifdef CONFIG_IPS
ips_enter(padapter); ips_enter(padapter);
ips_leave(padapter); ips_leave(padapter);
#endif
if (check_fwstate(pmlmepriv, _FW_LINKED)== true) if (check_fwstate(pmlmepriv, _FW_LINKED)== true)
{ {
_restore_network_status(padapter); _restore_network_status(padapter);

1
include/autoconf.h
View file

@ -48,7 +48,6 @@
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#define CONFIG_IPS
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_AP_MODE #define CONFIG_AP_MODE

2
include/osdep_intf.h
View file

@ -99,10 +99,8 @@ void rtw_ips_dev_unload(_adapter *padapter);
void rtw_bb_rf_gain_offset(_adapter *padapter); void rtw_bb_rf_gain_offset(_adapter *padapter);
#endif //CONFIG_RF_GAIN_OFFSET #endif //CONFIG_RF_GAIN_OFFSET
#ifdef CONFIG_IPS
int rtw_ips_pwr_up(_adapter *padapter); int rtw_ips_pwr_up(_adapter *padapter);
void rtw_ips_pwr_down(_adapter *padapter); void rtw_ips_pwr_down(_adapter *padapter);
#endif
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
int rtw_hw_suspend(_adapter *padapter ); int rtw_hw_suspend(_adapter *padapter );

2
include/rtw_pwrctrl.h
View file

@ -282,10 +282,8 @@ extern void rtw_free_pwrctrl_priv(_adapter * adapter);
extern void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); extern void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode);
extern void rtw_set_rpwm(_adapter * padapter, u8 val8); extern void rtw_set_rpwm(_adapter * padapter, u8 val8);
extern void LeaveAllPowerSaveMode(PADAPTER Adapter); extern void LeaveAllPowerSaveMode(PADAPTER Adapter);
#ifdef CONFIG_IPS
void ips_enter(_adapter * padapter); void ips_enter(_adapter * padapter);
int ips_leave(_adapter * padapter); int ips_leave(_adapter * padapter);
#endif
void rtw_ps_processor(_adapter*padapter); void rtw_ps_processor(_adapter*padapter);

8
os_dep/ioctl_linux.c
View file

@ -7840,10 +7840,8 @@ static int rtw_mp_efuse_get(struct net_device *dev,
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);
#ifdef CONFIG_IPS
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);
#endif
pch = extra; pch = extra;
DBG_88E("%s: in=%s\n", __func__, extra); DBG_88E("%s: in=%s\n", __func__, extra);
@ -8255,9 +8253,7 @@ exit:
if (!err) if (!err)
wrqu->length = strlen(extra); wrqu->length = strlen(extra);
#ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#endif
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
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;
@ -8312,10 +8308,8 @@ static int rtw_mp_efuse_set(struct net_device *dev,
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);
#ifdef CONFIG_IPS
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);
#endif
pch = extra; pch = extra;
DBG_88E("%s: in=%s\n", __func__, extra); DBG_88E("%s: in=%s\n", __func__, extra);
@ -8676,9 +8670,7 @@ exit:
if (setrawdata) if (setrawdata)
_rtw_mfree(setrawdata, EFUSE_MAX_SIZE); _rtw_mfree(setrawdata, EFUSE_MAX_SIZE);
#ifdef CONFIG_IPS
rtw_pm_set_ips(padapter, ips_mode); rtw_pm_set_ips(padapter, ips_mode);
#endif
rtw_pm_set_lps(padapter, lps_mode); rtw_pm_set_lps(padapter, lps_mode);
return err; return err;

9
os_dep/os_intfs.c
View file

@ -62,11 +62,7 @@ static int rtw_adhoc_tx_pwr = 1;
static int rtw_soft_ap = 0; static int rtw_soft_ap = 0;
#ifdef CONFIG_POWER_SAVING #ifdef CONFIG_POWER_SAVING
static int rtw_power_mgnt = 1; static int rtw_power_mgnt = 1;
#ifdef CONFIG_IPS_LEVEL_2
static int rtw_ips_mode = IPS_LEVEL_2;
#else
static int rtw_ips_mode = IPS_NORMAL; static int rtw_ips_mode = IPS_NORMAL;
#endif
#else #else
static int rtw_power_mgnt = PS_MODE_ACTIVE; static int rtw_power_mgnt = PS_MODE_ACTIVE;
static int rtw_ips_mode = IPS_NONE; static int rtw_ips_mode = IPS_NONE;
@ -1441,7 +1437,6 @@ int netdev_open(struct net_device *pnetdev)
return ret; return ret;
} }
#ifdef CONFIG_IPS
static int ips_netdrv_open(_adapter *padapter) static int ips_netdrv_open(_adapter *padapter)
{ {
int status = _SUCCESS; int status = _SUCCESS;
@ -1502,7 +1497,6 @@ void rtw_ips_pwr_down(_adapter *padapter)
padapter->bCardDisableWOHSM = false; padapter->bCardDisableWOHSM = false;
DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
} }
#endif
void rtw_ips_dev_unload(_adapter *padapter) void rtw_ips_dev_unload(_adapter *padapter)
{ {
@ -1547,11 +1541,8 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
if (true == bnormal) if (true == bnormal)
status = netdev_open(pnetdev); status = netdev_open(pnetdev);
#ifdef CONFIG_IPS
else else
status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1); status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
#endif
return status; return status;
} }

2
os_dep/usb_intf.c
View file

@ -552,9 +552,7 @@ int rtw_hw_suspend(_adapter *padapter )
//s2-4. //s2-4.
rtw_free_network_queue(padapter,true); rtw_free_network_queue(padapter,true);
#ifdef CONFIG_IPS
rtw_ips_dev_unload(padapter); rtw_ips_dev_unload(padapter);
#endif
pwrpriv->rf_pwrstate = rf_off; pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = false; pwrpriv->bips_processing = false;