skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-09-20 16:17:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove SUPPORT_HW_RFOFF_DETECTED

Browse source 
This symbol is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-24 10:26:03 -06:00
parent 7f75913cfb
commit 636309c83f
8 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/rtw_cmd.c
View file

@ -274,18 +274,14 @@ void rtw_free_evt_priv (struct evt_priv *pevtpriv)
void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
;
RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_cmd_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_cmd_priv\n"));
_rtw_free_cmd_priv(pcmdpriv); _rtw_free_cmd_priv(pcmdpriv);
;
} }
int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj);
int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{ {
u8 bAllow = false; /* set to true to allow enqueuing cmd when hw_init_completed is false */ u8 bAllow = false; /* set to true to allow enqueuing cmd when hw_init_completed is false */
#ifdef SUPPORT_HW_RFOFF_DETECTED
/* To decide allow or not */ /* To decide allow or not */
if( (adapter_to_pwrctl(pcmdpriv->padapter)->bHWPwrPindetect) if( (adapter_to_pwrctl(pcmdpriv->padapter)->bHWPwrPindetect)
&&(!pcmdpriv->padapter->registrypriv.usbss_enable) &&(!pcmdpriv->padapter->registrypriv.usbss_enable)
@ -301,7 +297,6 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
} }
} }
} }
#endif
if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan)) if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan))
bAllow = true; bAllow = true;

6
core/rtw_pwrctrl.c
View file

@ -201,13 +201,10 @@ void rtw_ps_processor(struct adapter*padapter)
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#ifdef SUPPORT_HW_RFOFF_DETECTED
rt_rf_power_state rfpwrstate; rt_rf_power_state rfpwrstate;
#endif /* SUPPORT_HW_RFOFF_DETECTED */
pwrpriv->ps_processing = true; pwrpriv->ps_processing = true;
#ifdef SUPPORT_HW_RFOFF_DETECTED
if(pwrpriv->bips_processing == true) if(pwrpriv->bips_processing == true)
goto exit; goto exit;
@ -263,7 +260,6 @@ void rtw_ps_processor(struct adapter*padapter)
} }
pwrpriv->pwr_state_check_cnts ++; pwrpriv->pwr_state_check_cnts ++;
} }
#endif /* SUPPORT_HW_RFOFF_DETECTED */
if (pwrpriv->ips_mode_req == IPS_NONE) if (pwrpriv->ips_mode_req == IPS_NONE)
goto exit; goto exit;
@ -1351,9 +1347,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
pwrctrlpriv->bkeepfwalive = false; pwrctrlpriv->bkeepfwalive = false;
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#ifdef SUPPORT_HW_RFOFF_DETECTED
pwrctrlpriv->pwr_state_check_interval = (pwrctrlpriv->bHWPwrPindetect) ?1000:2000; pwrctrlpriv->pwr_state_check_interval = (pwrctrlpriv->bHWPwrPindetect) ?1000:2000;
#endif
#endif #endif
pwrctrlpriv->LpsIdleCount = 0; pwrctrlpriv->LpsIdleCount = 0;

10
hal/usb_halinit.c
View file

@ -1810,16 +1810,12 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E);
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED
DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive); DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive);
if(pwrctl->bkeepfwalive) if(pwrctl->bkeepfwalive)
{ {
if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown)) if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown))
rtl8188eu_hw_power_down(Adapter); rtl8188eu_hw_power_down(Adapter);
} } else {
else
#endif
{
if(Adapter->hw_init_completed == true){ if(Adapter->hw_init_completed == true){
hal_poweroff_rtl8188eu(Adapter); hal_poweroff_rtl8188eu(Adapter);
@ -3826,11 +3822,11 @@ static u8 rtl8188eu_ps_func(struct adapter *Adapter,HAL_INTF_PS_FUNC efunc_id, u
u8 bResult = true; u8 bResult = true;
switch(efunc_id){ switch(efunc_id){
#if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) #if defined(CONFIG_AUTOSUSPEND)
case HAL_USB_SELECT_SUSPEND: case HAL_USB_SELECT_SUSPEND:
u8 bfwpoll = *(( u8*)val); u8 bfwpoll = *(( u8*)val);
break; break;
#endif /* CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED */ #endif /* CONFIG_AUTOSUSPEND */
default: default:
break; break;

2
include/autoconf.h
View file

@ -32,8 +32,6 @@
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_LPS #define CONFIG_LPS
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK

3
include/recv_osdep.h
View file

@ -24,11 +24,8 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifdef SUPPORT_HW_RFOFF_DETECTED
int rtw_hw_suspend(struct adapter *padapter ); int rtw_hw_suspend(struct adapter *padapter );
int rtw_hw_resume(struct adapter *padapter); int rtw_hw_resume(struct adapter *padapter);
#endif
extern void rtw_dev_unload(struct adapter *padapter); extern void rtw_dev_unload(struct adapter *padapter);
extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);

3
include/rtw_pwrctrl.h
View file

@ -330,10 +330,7 @@ void rtw_ps_processor(struct adapter*padapter);
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
int autoresume_enter(struct adapter* padapter); int autoresume_enter(struct adapter* padapter);
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED
rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ); rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter );
#endif
#ifdef CONFIG_LPS #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);

2
os_dep/os_intfs.c
View file

@ -378,10 +378,8 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
registry_par->usbss_enable = (u8)rtw_enusbss;/* 0:disable,1:enable */ registry_par->usbss_enable = (u8)rtw_enusbss;/* 0:disable,1:enable */
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED
registry_par->hwpdn_mode = (u8)rtw_hwpdn_mode;/* 0:disable,1:enable,2:by EFUSE config */ 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->hwpwrp_detect = (u8)rtw_hwpwrp_detect;/* 0:disable,1:enable */
#endif
registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable; registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable;
registry_par->hw_wps_pbc = (u8)rtw_hw_wps_pbc; registry_par->hw_wps_pbc = (u8)rtw_hw_wps_pbc;

8
os_dep/usb_intf.c
View file

@ -546,7 +546,6 @@ static void process_spec_devid(const struct usb_device_id *pdid)
} }
} }
#ifdef SUPPORT_HW_RFOFF_DETECTED
int rtw_hw_suspend(struct adapter *padapter ) int rtw_hw_suspend(struct adapter *padapter )
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -672,9 +671,7 @@ error_exit:
DBG_871X("%s, Open net dev failed \n",__FUNCTION__); DBG_871X("%s, Open net dev failed \n",__FUNCTION__);
return (-1); return (-1);
} }
#endif
#if 1
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
static void rtw_suspend_wow(struct adapter *padapter) static void rtw_suspend_wow(struct adapter *padapter)
{ {
@ -785,7 +782,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
if(pwrpriv->bInternalAutoSuspend ) if(pwrpriv->bInternalAutoSuspend )
{ {
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#ifdef SUPPORT_HW_RFOFF_DETECTED
/* The FW command register update must after MAC and FW init ready. */ /* The FW command register update must after MAC and FW init ready. */
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable ))
{ {
@ -793,7 +789,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
} }
#endif #endif
#endif
} }
pwrpriv->bInSuspend = true; pwrpriv->bInSuspend = true;
@ -819,7 +814,6 @@ exit:
; ;
return ret; return ret;
} }
#endif
static int rtw_resume(struct usb_interface *pusb_intf) static int rtw_resume(struct usb_interface *pusb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
@ -903,7 +897,6 @@ int rtw_resume_process(struct adapter *padapter)
if(pwrpriv->bInternalAutoSuspend ) if(pwrpriv->bInternalAutoSuspend )
{ {
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#ifdef SUPPORT_HW_RFOFF_DETECTED
/* The FW command register update must after MAC and FW init ready. */ /* The FW command register update must after MAC and FW init ready. */
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable )) if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable ))
{ {
@ -911,7 +904,6 @@ int rtw_resume_process(struct adapter *padapter)
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
} }
#endif #endif
#endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if( true == pwrpriv->bAutoResume ){ if( true == pwrpriv->bAutoResume ){