From 7f426e6764abfb2ea6ec5aefecab6caf618c82fc Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 1 Mar 2015 22:55:42 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_LED and related configuration variables Signed-off-by: Larry Finger --- core/rtw_led.c | 59 --------------------------------------------- core/rtw_mlme_ext.c | 5 ---- hal/usb_halinit.c | 22 ----------------- include/autoconf.h | 5 ---- 4 files changed, 91 deletions(-) diff --git a/core/rtw_led.c b/core/rtw_led.c index e9b2adc..c631838 100755 --- a/core/rtw_led.c +++ b/core/rtw_led.c @@ -38,11 +38,7 @@ void BlinkTimerCallback(void *data) return; } - #ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD - rtw_led_blink_cmd(padapter, pLed); - #else _set_workitem(&(pLed->BlinkWorkItem)); - #endif } /* */ @@ -120,8 +116,6 @@ DeInitLed871x( /* It toggle off LED and schedule corresponding timer if necessary. */ /* */ -#define CONFIG_LED_REMOVE_HAL - static void SwLedBlink(PLED_871x pLed) { struct adapter *padapter = pLed->padapter; @@ -240,19 +234,11 @@ static void SwLedBlink(PLED_871x pLed) static void SwLedBlink1(PLED_871x pLed) { 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 mlme_priv *pmlmepriv = &(padapter->mlmepriv); PLED_871x pLed1 = &(ledpriv->SwLed1); 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. */ 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)); } -#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 ) { SwLedOff(padapter, pLed); @@ -1179,18 +1136,10 @@ SwLedControlMode1( LED_CTL_MODE LedAction ) { -#ifndef CONFIG_LED_REMOVE_HAL - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -#endif struct led_priv *ledpriv = &(padapter->ledpriv); PLED_871x pLed = &(ledpriv->SwLed0); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -#ifndef CONFIG_LED_REMOVE_HAL - if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) - pLed = &(ledpriv->SwLed1); -#endif - switch(LedAction) { case LED_CTL_POWER_ON: @@ -2130,18 +2079,10 @@ SwLedControlMode5( 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 mlme_priv *pmlmepriv = &padapter->mlmepriv; PLED_871x pLed = &(ledpriv->SwLed0); -#ifndef CONFIG_LED_REMOVE_HAL - if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) - pLed = &(ledpriv->SwLed1); -#endif - switch(LedAction) { case LED_CTL_POWER_ON: diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index bf05abf..b84c082 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -11017,11 +11017,6 @@ u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf) return H2C_PARAMETERS_ERROR; ledBlink_param = (struct LedBlink_param *)pbuf; - - #ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD - BlinkHandler(ledBlink_param->pLed); - #endif - return H2C_SUCCESS; } diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 48f58eb..8fcb1ee 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -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 _InitRDGSetting( 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_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ -#ifdef CONFIG_LED - _InitHWLed(Adapter); -#endif /* CONFIG_LED */ - - - /* */ /* Joseph Note: Keep RfRegChnlVal for later use. */ - /* */ 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); diff --git a/include/autoconf.h b/include/autoconf.h index 8cfe959..195a6c3 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -36,11 +36,6 @@ #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 CONFIG_GLOBAL_UI_PID