mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 22:43:04 +00:00
rtl8188eu: Remove CONFIG_AUTOSUSPEND - not defined
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
5175f81cb1
commit
6d47834466
8 changed files with 17 additions and 423 deletions
|
|
@ -659,9 +659,6 @@ _func_enter_;
|
|||
registry_par->bAcceptAddbaReq = (u8)rtw_AcceptAddbaReq;
|
||||
registry_par->antdiv_cfg = (u8)rtw_antdiv_cfg;
|
||||
registry_par->antdiv_type = (u8)rtw_antdiv_type;
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
registry_par->usbss_enable = (u8)rtw_enusbss;//0:disable,1:enable
|
||||
#endif
|
||||
registry_par->hwpdn_mode = (u8)rtw_hwpdn_mode;//0:disable,1:enable,2:by EFUSE config
|
||||
registry_par->hwpwrp_detect = (u8)rtw_hwpwrp_detect;//0:disable,1:enable
|
||||
registry_par->hw_wps_pbc = (u8)rtw_hw_wps_pbc;
|
||||
|
|
@ -997,12 +994,6 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
|
|||
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
|
||||
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,34))
|
||||
adapter_to_dvobj(padapter)->pusbdev->autosuspend_disabled = 1;//autosuspend disabled by the user
|
||||
#endif
|
||||
#endif
|
||||
|
||||
rtw_hal_sreset_reset_value(padapter);
|
||||
pwrctrlpriv->pwr_state_check_cnts = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -148,9 +148,6 @@ static struct rtw_usb_drv rtl8188e_usb_drv = {
|
|||
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
|
||||
.usbdrv.reset_resume = rtw_resume,
|
||||
#endif
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
.usbdrv.supports_autosuspend = 1,
|
||||
#endif
|
||||
};
|
||||
|
||||
static struct rtw_usb_drv *usb_drv = &rtl8188e_usb_drv;
|
||||
|
|
@ -640,23 +637,11 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
|
|||
goto exit;
|
||||
}
|
||||
|
||||
if (pwrpriv->bInternalAutoSuspend )
|
||||
{
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
// The FW command register update must after MAC and FW init ready.
|
||||
if ((padapter->bFWReady) && ( padapter->pwrctrlpriv.bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable ))
|
||||
{
|
||||
u8 bOpen = true;
|
||||
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
pwrpriv->bInSuspend = true;
|
||||
rtw_cancel_all_timer(padapter);
|
||||
LeaveAllPowerSaveMode(padapter);
|
||||
|
||||
_enter_pwrlock(&pwrpriv->lock);
|
||||
//padapter->net_closed = true;
|
||||
//s1.
|
||||
if (pnetdev)
|
||||
{
|
||||
|
|
@ -692,17 +677,10 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
|
|||
rtw_indicate_disconnect(padapter);
|
||||
//s2-3.
|
||||
rtw_free_assoc_resources(padapter, 1);
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
if (!pwrpriv->bInternalAutoSuspend )
|
||||
#endif
|
||||
//s2-4.
|
||||
rtw_free_network_queue(padapter, true);
|
||||
|
||||
rtw_dev_unload(padapter);
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
pwrpriv->rf_pwrstate = rf_off;
|
||||
pwrpriv->bips_processing = false;
|
||||
#endif
|
||||
_exit_pwrlock(&pwrpriv->lock);
|
||||
|
||||
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
|
||||
|
|
@ -755,25 +733,6 @@ int rtw_resume_process(_adapter *padapter)
|
|||
}
|
||||
|
||||
_enter_pwrlock(&pwrpriv->lock);
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
|
||||
DBG_88E("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume);
|
||||
pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt));
|
||||
#else
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt);
|
||||
pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt;
|
||||
#endif
|
||||
|
||||
DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
|
||||
if ( true == pwrpriv->bAutoResume ){
|
||||
pwrpriv->bInternalAutoSuspend = false;
|
||||
pwrpriv->bAutoResume=false;
|
||||
DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
|
||||
|
||||
}
|
||||
#endif //#ifdef CONFIG_AUTOSUSPEND
|
||||
#endif //#ifdef CONFIG_BT_COEXIST
|
||||
rtw_reset_drv_sw(padapter);
|
||||
pwrpriv->bkeepfwalive = false;
|
||||
|
||||
|
|
@ -784,50 +743,6 @@ int rtw_resume_process(_adapter *padapter)
|
|||
netif_device_attach(pnetdev);
|
||||
netif_carrier_on(pnetdev);
|
||||
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
if (pwrpriv->bInternalAutoSuspend )
|
||||
{
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
// The FW command register update must after MAC and FW init ready.
|
||||
if ((padapter->bFWReady) && ( padapter->pwrctrlpriv.bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable ))
|
||||
{
|
||||
//rtl8192c_set_FwSelectSuspend_cmd(padapter,false ,500);//note fw to support hw power down ping detect
|
||||
u8 bOpen = false;
|
||||
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
|
||||
if ( true == pwrpriv->bAutoResume ){
|
||||
pwrpriv->bInternalAutoSuspend = false;
|
||||
pwrpriv->bAutoResume=false;
|
||||
DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
|
||||
}
|
||||
|
||||
#else //#ifdef CONFIG_BT_COEXIST
|
||||
pwrpriv->bInternalAutoSuspend = false;
|
||||
#endif //#ifdef CONFIG_BT_COEXIST
|
||||
pwrpriv->brfoffbyhw = false;
|
||||
{
|
||||
DBG_88E("enc_algorithm(%x),wepkeymask(%x)\n",
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm,pwrpriv->wepkeymask);
|
||||
if ( (_WEP40_ == padapter->securitypriv.dot11PrivacyAlgrthm) ||
|
||||
(_WEP104_ == padapter->securitypriv.dot11PrivacyAlgrthm))
|
||||
{
|
||||
sint keyid;
|
||||
|
||||
for (keyid=0;keyid<4;keyid++){
|
||||
if (pwrpriv->wepkeymask & BIT(keyid)) {
|
||||
if (keyid == padapter->securitypriv.dot11PrivacyKeyIndex)
|
||||
rtw_set_key(padapter,&padapter->securitypriv, keyid, 1);
|
||||
else
|
||||
rtw_set_key(padapter,&padapter->securitypriv, keyid, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
_exit_pwrlock(&pwrpriv->lock);
|
||||
|
||||
if ( padapter->pid[1]!=0) {
|
||||
|
|
@ -848,128 +763,6 @@ exit:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
void autosuspend_enter(_adapter* padapter)
|
||||
{
|
||||
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
|
||||
|
||||
DBG_88E("==>autosuspend_enter...........\n");
|
||||
|
||||
pwrpriv->bInternalAutoSuspend = true;
|
||||
pwrpriv->bips_processing = true;
|
||||
|
||||
if (rf_off == pwrpriv->change_rfpwrstate )
|
||||
{
|
||||
#ifndef CONFIG_BT_COEXIST
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
|
||||
usb_enable_autosuspend(dvobj->pusbdev);
|
||||
#else
|
||||
dvobj->pusbdev->autosuspend_disabled = 0;//autosuspend disabled by the user
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
|
||||
usb_autopm_put_interface(dvobj->pusbintf);
|
||||
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
|
||||
usb_autopm_enable(dvobj->pusbintf);
|
||||
#else
|
||||
usb_autosuspend_device(dvobj->pusbdev, 1);
|
||||
#endif
|
||||
#else //#ifndef CONFIG_BT_COEXIST
|
||||
if (1==pwrpriv->autopm_cnt){
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
|
||||
usb_enable_autosuspend(dvobj->pusbdev);
|
||||
#else
|
||||
dvobj->pusbdev->autosuspend_disabled = 0;//autosuspend disabled by the user
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
|
||||
usb_autopm_put_interface(dvobj->pusbintf);
|
||||
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
|
||||
usb_autopm_enable(dvobj->pusbintf);
|
||||
#else
|
||||
usb_autosuspend_device(dvobj->pusbdev, 1);
|
||||
#endif
|
||||
pwrpriv->autopm_cnt --;
|
||||
}
|
||||
else
|
||||
DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_put_interface\n", pwrpriv->autopm_cnt);
|
||||
|
||||
#endif //#ifndef CONFIG_BT_COEXIST
|
||||
}
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
|
||||
#else
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
|
||||
#endif
|
||||
|
||||
}
|
||||
int autoresume_enter(_adapter* padapter)
|
||||
{
|
||||
int result = _SUCCESS;
|
||||
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
|
||||
struct security_priv* psecuritypriv=&(padapter->securitypriv);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
|
||||
|
||||
DBG_88E("====> autoresume_enter\n");
|
||||
|
||||
if (rf_off == pwrpriv->rf_pwrstate )
|
||||
{
|
||||
pwrpriv->ps_flag = false;
|
||||
#ifndef CONFIG_BT_COEXIST
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
|
||||
if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
|
||||
{
|
||||
DBG_88E( "can't get autopm: %d\n", result);
|
||||
result = _FAIL;
|
||||
goto error_exit;
|
||||
}
|
||||
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
|
||||
usb_autopm_disable(dvobj->pusbintf);
|
||||
#else
|
||||
usb_autoresume_device(dvobj->pusbdev, 1);
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
|
||||
#else
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
|
||||
#endif
|
||||
#else //#ifndef CONFIG_BT_COEXIST
|
||||
pwrpriv->bAutoResume=true;
|
||||
if (0==pwrpriv->autopm_cnt){
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
|
||||
if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
|
||||
{
|
||||
DBG_88E( "can't get autopm: %d\n", result);
|
||||
result = _FAIL;
|
||||
goto error_exit;
|
||||
}
|
||||
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
|
||||
usb_autopm_disable(dvobj->pusbintf);
|
||||
#else
|
||||
usb_autoresume_device(dvobj->pusbdev, 1);
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
|
||||
#else
|
||||
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
|
||||
#endif
|
||||
pwrpriv->autopm_cnt++;
|
||||
}
|
||||
else
|
||||
DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt);
|
||||
#endif //#ifndef CONFIG_BT_COEXIST
|
||||
}
|
||||
DBG_88E("<==== autoresume_enter\n");
|
||||
error_exit:
|
||||
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* drv_init() - a device potentially for us
|
||||
*
|
||||
|
|
@ -1046,33 +839,6 @@ static _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_AUTOSUSPEND
|
||||
if ( padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE )
|
||||
{
|
||||
if (padapter->registrypriv.usbss_enable ){ /* autosuspend (2s delay) */
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,38))
|
||||
dvobj->pusbdev->dev.power.autosuspend_delay = 0 * HZ;//15 * HZ; idle-delay time
|
||||
#else
|
||||
dvobj->pusbdev->autosuspend_delay = 0 * HZ;//15 * HZ; idle-delay time
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
|
||||
usb_enable_autosuspend(dvobj->pusbdev);
|
||||
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,34))
|
||||
padapter->bDisableAutosuspend = dvobj->pusbdev->autosuspend_disabled ;
|
||||
dvobj->pusbdev->autosuspend_disabled = 0;//autosuspend disabled by the user
|
||||
#endif
|
||||
|
||||
//usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf );//init pm_usage_cnt ,let it start from 1
|
||||
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
|
||||
DBG_88E("%s...pm_usage_cnt(%d).....\n",__func__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
|
||||
#else
|
||||
DBG_88E("%s...pm_usage_cnt(%d).....\n",__func__,dvobj->pusbintf ->pm_usage_cnt);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
//2012-07-11 Move here to prevent the 8723AS-VAU BT auto suspend influence
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
|
||||
if (usb_autopm_get_interface(pusb_intf) < 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue