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

rtl8188eu: Remove CONFIG_LED and related configuration variables

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-01 22:55:42 -06:00
parent 27f745af7b
commit 7f426e6764
4 changed files with 0 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
core/rtw_led.c
View file

@ -38,11 +38,7 @@ void BlinkTimerCallback(void *data)
return; return;
} }
#ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD
rtw_led_blink_cmd(padapter, pLed);
#else
_set_workitem(&(pLed->BlinkWorkItem)); _set_workitem(&(pLed->BlinkWorkItem));
#endif
} }
/* */ /* */
@ -120,8 +116,6 @@ DeInitLed871x(
/* It toggle off LED and schedule corresponding timer if necessary. */ /* It toggle off LED and schedule corresponding timer if necessary. */
/* */ /* */
#define CONFIG_LED_REMOVE_HAL
static void SwLedBlink(PLED_871x pLed) static void SwLedBlink(PLED_871x pLed)
{ {
struct adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
@ -240,19 +234,11 @@ static void SwLedBlink(PLED_871x pLed)
static void SwLedBlink1(PLED_871x pLed) static void SwLedBlink1(PLED_871x pLed)
{ {
struct adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
#ifndef CONFIG_LED_REMOVE_HAL
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#endif
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
PLED_871x pLed1 = &(ledpriv->SwLed1); PLED_871x pLed1 = &(ledpriv->SwLed1);
u8 bStopBlinking = false; u8 bStopBlinking = false;
#ifndef CONFIG_LED_REMOVE_HAL
if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO)
pLed = &(ledpriv->SwLed1);
#endif
/* Change LED according to BlinkingLedState specified. */ /* Change LED according to BlinkingLedState specified. */
if( pLed->BlinkingLedState == RTW_LED_ON ) if( pLed->BlinkingLedState == RTW_LED_ON )
{ {
@ -265,35 +251,6 @@ static void SwLedBlink1(PLED_871x pLed)
RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes));
} }
#ifndef CONFIG_LED_REMOVE_HAL
if(pHalData->EEPROMCustomerID == RT_CID_DEFAULT)
{
if(check_fwstate(pmlmepriv, _FW_LINKED)== true)
{
if(!pLed1->bSWLedCtrl)
{
SwLedOn(padapter, pLed1);
pLed1->bSWLedCtrl = true;
}
else if(!pLed1->bLedOn)
SwLedOn(padapter, pLed1);
RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (): turn on pLed1\n"));
}
else
{
if(!pLed1->bSWLedCtrl)
{
SwLedOff(padapter, pLed1);
pLed1->bSWLedCtrl = true;
}
else if(pLed1->bLedOn)
SwLedOff(padapter, pLed1);
RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (): turn off pLed1\n"));
}
}
#endif
if(adapter_to_pwrctl(padapter)->rf_pwrstate != rf_on ) if(adapter_to_pwrctl(padapter)->rf_pwrstate != rf_on )
{ {
SwLedOff(padapter, pLed); SwLedOff(padapter, pLed);
@ -1179,18 +1136,10 @@ SwLedControlMode1(
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
#ifndef CONFIG_LED_REMOVE_HAL
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#endif
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
PLED_871x pLed = &(ledpriv->SwLed0); PLED_871x pLed = &(ledpriv->SwLed0);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#ifndef CONFIG_LED_REMOVE_HAL
if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO)
pLed = &(ledpriv->SwLed1);
#endif
switch(LedAction) switch(LedAction)
{ {
case LED_CTL_POWER_ON: case LED_CTL_POWER_ON:
@ -2130,18 +2079,10 @@ SwLedControlMode5(
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
#ifndef CONFIG_LED_REMOVE_HAL
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#endif
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
PLED_871x pLed = &(ledpriv->SwLed0); PLED_871x pLed = &(ledpriv->SwLed0);
#ifndef CONFIG_LED_REMOVE_HAL
if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO)
pLed = &(ledpriv->SwLed1);
#endif
switch(LedAction) switch(LedAction)
{ {
case LED_CTL_POWER_ON: case LED_CTL_POWER_ON:

5
core/rtw_mlme_ext.c
View file

@ -11017,11 +11017,6 @@ u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
return H2C_PARAMETERS_ERROR; return H2C_PARAMETERS_ERROR;
ledBlink_param = (struct LedBlink_param *)pbuf; ledBlink_param = (struct LedBlink_param *)pbuf;
#ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD
BlinkHandler(ledBlink_param->pLed);
#endif
return H2C_SUCCESS; return H2C_SUCCESS;
} }

22
hal/usb_halinit.c
View file

@ -754,21 +754,6 @@ _InitBeaconMaxError(
} }
#ifdef CONFIG_LED
static void _InitHWLed(struct adapter *Adapter)
{
struct led_priv *pledpriv = &(Adapter->ledpriv);
if( pledpriv->LedStrategy != HW_LED)
return;
/* HW led control */
/* to do .... */
/* must consider cases of antenna diversity/ commbo card/solo card/mini card */
}
#endif /* CONFIG_LED */
static void static void
_InitRDGSetting( _InitRDGSetting(
IN struct adapter *Adapter IN struct adapter *Adapter
@ -1525,14 +1510,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02);
rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */
rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */
#ifdef CONFIG_LED
_InitHWLed(Adapter);
#endif /* CONFIG_LED */
/* */
/* Joseph Note: Keep RfRegChnlVal for later use. */ /* Joseph Note: Keep RfRegChnlVal for later use. */
/* */
pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)0, RF_CHNLBW, bRFRegOffsetMask); pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)0, RF_CHNLBW, bRFRegOffsetMask);
pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)1, RF_CHNLBW, bRFRegOffsetMask); pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)1, RF_CHNLBW, bRFRegOffsetMask);

5
include/autoconf.h
View file

@ -36,11 +36,6 @@
#define CONFIG_SKB_COPY //for amsdu #define CONFIG_SKB_COPY //for amsdu
//#define CONFIG_LED
#ifdef CONFIG_LED
#define CONFIG_SW_LED
#endif // CONFIG_LED
#define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface #define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface
#define CONFIG_GLOBAL_UI_PID #define CONFIG_GLOBAL_UI_PID