staging: r8188eu: remove dead led code
cover staging: r8188eu: remove dead led code
This series removes led related code that is not used in this driver.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (5):
staging: r8188eu: remove dead led blink functions
staging: r8188eu: remove dead led control functions
staging: r8188eu: remove unnecessary comments
staging: r8188eu: remove _InitHWLed()
staging: r8188eu: remove LedStrategy from struct led_priv
drivers/staging/r8188eu/core/rtw_led.c | 1364 ++------------------- drivers/staging/r8188eu/hal/usb_halinit.c | 15 - drivers/staging/r8188eu/include/rtw_led.h | 18 - 3 files changed, 90 insertions(+), 1307 deletions(-)
Signature · 1 line
2.33.0
PATCH 1/5 staging: r8188eu: remove dead led blink functions
LedStrategy is SW_LED_MODE1 in this driver. Remove led blink functions that are not used for SW_LED_MODE1.
--- drivers/staging/r8188eu/core/rtw_led.c | 524 +------------------------ 1 file changed, 1 insertion(+), 523 deletions(-)
drivers/staging/r8188eu/core/rtw_led.c +1 -523
@@ -76,84 +76,6 @@ void DeInitLed871x(struct LED_871x *pLed)ResetLedStatus (pLed); } -/* */ -/* Description: */ -/* Implementation of LED blinking behavior. */ -/* It toggle off LED and schedule corresponding timer if necessary. */ -/* */ - -static void SwLedBlink (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -u8 bStopBlinking = false; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) -SwLedOn (padapter, pLed); -else -SwLedOff (padapter, pLed); - -/* Determine if we shall change LED state again. */ - pLed->BlinkTimes--; -switch (pLed->CurrLedState) { -case LED_BLINK_NORMAL : -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -break ; -case LED_BLINK_StartToBlink: -if (check_fwstate (pmlmepriv, _FW_LINKED) &&check_fwstate (pmlmepriv,WIFI_STATION_STATE )) - bStopBlinking = true; -if (check_fwstate (pmlmepriv, _FW_LINKED) && - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) || -check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) - bStopBlinking = true; -else if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -break ; -case LED_BLINK_WPS : -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -break ; -default : - bStopBlinking = true; -break ; - } - -if (bStopBlinking) { -if (check_fwstate (pmlmepriv, _FW_LINKED) && !pLed->bLedOn) { -SwLedOn (padapter, pLed); - }else if (check_fwstate (pmlmepriv, _FW_LINKED) && pLed->bLedOn) { -SwLedOff (padapter, pLed); - } - pLed->BlinkTimes =0 ; - pLed->bLedBlinkInProgress = false; - }else { -/* Assign LED state to toggle. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; - -/* Schedule a timer to toggle LED state. */ -switch (pLed->CurrLedState) { -case LED_BLINK_NORMAL : -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); -break ; -case LED_BLINK_SLOWLY : -case LED_BLINK_StartToBlink: -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); -break ; -case LED_BLINK_WPS : -_set_timer (&pLed->BlinkTimer,LED_BLINK_LONG_INTERVAL ); -break ; -default : -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); -break ; - } - } -} -static void SwLedBlink1 (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter;
@@ -283,420 +205,6 @@ static void SwLedBlink1(struct LED_871x *pLed) } } -static void SwLedBlink2 (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -u8 bStopBlinking = false; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) -SwLedOn (padapter, pLed); -else -SwLedOff (padapter, pLed); - -switch (pLed->CurrLedState) { -case LED_BLINK_SCAN : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else if (check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -SwLedOn (padapter, pLed); - }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -SwLedOff (padapter, pLed); - } - pLed->bLedScanBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_TXRX : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else if (check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -SwLedOn (padapter, pLed); - }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -SwLedOff (padapter, pLed); - } - pLed->bLedBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - } -break ; -default : -break ; - } -} - -static void SwLedBlink3 (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -u8 bStopBlinking = false; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) { -SwLedOn (padapter, pLed); - }else { -if (pLed->CurrLedState !=LED_BLINK_WPS_STOP ) -SwLedOff (padapter, pLed); - } - -switch (pLed->CurrLedState) { -case LED_BLINK_SCAN : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else if (check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (!pLed->bLedOn) -SwLedOn (padapter, pLed); - }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -if (pLed->bLedOn) -SwLedOff (padapter, pLed); - } - pLed->bLedScanBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_TXRX : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else if (check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (!pLed->bLedOn) -SwLedOn (padapter, pLed); - }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; - -if (pLed->bLedOn) -SwLedOff (padapter, pLed); - } - pLed->bLedBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_WPS : -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); -break ; -case LED_BLINK_WPS_STOP :/* WPS success */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); - bStopBlinking = false; - }else { - bStopBlinking = true; - } -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -SwLedOn (padapter, pLed); - } - pLed->bLedWPSBlinkInProgress = false; - } -break ; -default : -break ; - } -} - -static void SwLedBlink4 (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; -struct led_priv *ledpriv = &padapter->ledpriv; -struct LED_871x *pLed1 = &ledpriv->SwLed1; -u8 bStopBlinking = false; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) -SwLedOn (padapter, pLed); -else -SwLedOff (padapter, pLed); - -if (!pLed1->bLedWPSBlinkInProgress && pLed1->BlinkingLedState ==LED_UNKNOWN ) { - pLed1->BlinkingLedState =RTW_LED_OFF ; - pLed1->CurrLedState =RTW_LED_OFF ; -SwLedOff (padapter, pLed1); - } - -switch (pLed->CurrLedState) { -case LED_BLINK_SLOWLY : -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); -break ; -case LED_BLINK_StartToBlink: -if (pLed->bLedOn) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); - }else { - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); - } -break ; -case LED_BLINK_SCAN : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = false; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { - pLed->bLedNoLinkBlinkInProgress = false; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - } - pLed->bLedScanBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_TXRX : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - } - pLed->bLedBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_WPS : -if (pLed->bLedOn) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); - }else { - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); - } -break ; -case LED_BLINK_WPS_STOP :/* WPS authentication fail */ -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; - -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); -break ; -case LED_BLINK_WPS_STOP_OVERLAP :/* WPS session overlap */ - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) { -if (pLed->bLedOn) - pLed->BlinkTimes =1 ; -else - bStopBlinking = true; - } - -if (bStopBlinking) { - pLed->BlinkTimes =10 ; - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; - -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); - } -break ; -default : -break ; - } -} - -static void SwLedBlink5 (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; -u8 bStopBlinking = false; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) -SwLedOn (padapter, pLed); -else -SwLedOff (padapter, pLed); - -switch (pLed->CurrLedState) { -case LED_BLINK_SCAN : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; - -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -if (pLed->bLedOn) -SwLedOff (padapter, pLed); - }else { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (!pLed->bLedOn) -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - - pLed->bLedScanBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } - } -break ; -case LED_BLINK_TXRX : - pLed->BlinkTimes--; -if (pLed->BlinkTimes ==0 ) - bStopBlinking = true; - -if (bStopBlinking) { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -if (pLed->bLedOn) -SwLedOff (padapter, pLed); - }else { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (!pLed->bLedOn) -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - - pLed->bLedBlinkInProgress = false; - }else { -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason >RF_CHANGE_BY_PS ) { -SwLedOff (padapter, pLed); - }else { -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } - } -break ; - -default : -break ; - } -} - -static void SwLedBlink6 (struct LED_871x *pLed) -{ -struct adapter *padapter = pLed->padapter; - -/* Change LED according to BlinkingLedState specified. */ -if (pLed->BlinkingLedState ==RTW_LED_ON ) -SwLedOn (padapter, pLed); -else -SwLedOff (padapter, pLed); -} -/* ALPHA, added by chiyoko, 20090106 */ static void SwLedControlMode1 (struct adapter *padapter,enum LED_CTL_MODE LedAction) {
@@ -1520,44 +1028,14 @@ SwLedControlMode6( } } -/* */ -/* Description: */ -/* Handler function of LED Blinking. */ -/* We dispatch acture LED blink action according to LedStrategy. */ -/* */ void BlinkHandler (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct led_priv *ledpriv = &padapter->ledpriv;if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))return ; -switch (ledpriv->LedStrategy) { -case SW_LED_MODE0 : -SwLedBlink (pLed); -break ; -case SW_LED_MODE1 : -SwLedBlink1 (pLed); -break ; -case SW_LED_MODE2 : -SwLedBlink2 (pLed); -break ; -case SW_LED_MODE3 : -SwLedBlink3 (pLed); -break ; -case SW_LED_MODE4 : -SwLedBlink4 (pLed); -break ; -case SW_LED_MODE5 : -SwLedBlink5 (pLed); -break ; -case SW_LED_MODE6 : -SwLedBlink6 (pLed); -break ; -default : -break ; - } +SwLedBlink1 (pLed); }void LedControl8188eu (struct adapter *padapter,enum LED_CTL_MODE LedAction)
Signature · 1 line
2.33.0
PATCH 2/5 staging: r8188eu: remove dead led control functions
In reply to Michael StraubeLedStrategy is SW_LED_MODE1 in this driver. Remove led control functions that are not used for SW_LED_MODE1.
--- drivers/staging/r8188eu/core/rtw_led.c | 643 +------------------------ 1 file changed, 1 insertion(+), 642 deletions(-)
drivers/staging/r8188eu/core/rtw_led.c +1 -642
@@ -410,624 +410,6 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct } } -/* Arcadyan/Sitecom , added by chiyoko, 20090216 */ -static void SwLedControlMode2 (struct adapter *padapter,enum LED_CTL_MODE LedAction) -{ -struct led_priv *ledpriv = &padapter->ledpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &ledpriv->SwLed0; - -switch (LedAction) { -case LED_CTL_SITE_SURVEY : -if (pmlmepriv->LinkDetectInfo.bBusyTraffic) { - }else if (!pLed->bLedScanBlinkInProgress) { -if (IS_LED_WPS_BLINKING (pLed)) -return ; - -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - pLed->bLedScanBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SCAN ; - pLed->BlinkTimes =24 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_TX : -case LED_CTL_RX : -if ((!pLed->bLedBlinkInProgress) && (check_fwstate (pmlmepriv, _FW_LINKED))) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; - pLed->bLedBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_TXRX ; - pLed->BlinkTimes =2 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_LINK : - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } -_set_timer (&pLed->BlinkTimer,0 ); -break ; -case LED_CTL_START_WPS :/* wait until xinpin finish */ -case LED_CTL_START_WPS_BOTTON : -if (!pLed->bLedWPSBlinkInProgress) { -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } - pLed->bLedWPSBlinkInProgress = true; - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_STOP_WPS : - pLed->bLedWPSBlinkInProgress = false; -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_STOP_WPS_FAIL : - pLed->bLedWPSBlinkInProgress = false; -if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) { -SwLedOff (padapter, pLed); - }else { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_START_TO_LINK : -case LED_CTL_NO_LINK : -if (!IS_LED_BLINKING (pLed)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_POWER_OFF : - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - -_set_timer (&pLed->BlinkTimer,0 ); -break ; -default : -break ; - } -} - -/* COREGA, added by chiyoko, 20090316 */ -static void SwLedControlMode3 (struct adapter *padapter,enum LED_CTL_MODE LedAction) -{ -struct led_priv *ledpriv = &padapter->ledpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &ledpriv->SwLed0; - -switch (LedAction) { -case LED_CTL_SITE_SURVEY : -if (pmlmepriv->LinkDetectInfo.bBusyTraffic) { - }else if (!pLed->bLedScanBlinkInProgress) { -if (IS_LED_WPS_BLINKING (pLed)) -return ; - -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - pLed->bLedScanBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SCAN ; - pLed->BlinkTimes =24 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_TX : -case LED_CTL_RX : -if ((!pLed->bLedBlinkInProgress) && (check_fwstate (pmlmepriv, _FW_LINKED))) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; - pLed->bLedBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_TXRX ; - pLed->BlinkTimes =2 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_LINK : -if (IS_LED_WPS_BLINKING (pLed)) -return ; - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } - -_set_timer (&pLed->BlinkTimer,0 ); -break ; -case LED_CTL_START_WPS :/* wait until xinpin finish */ -case LED_CTL_START_WPS_BOTTON : -if (!pLed->bLedWPSBlinkInProgress) { -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } - pLed->bLedWPSBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_WPS ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_STOP_WPS : -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - }else { - pLed->bLedWPSBlinkInProgress = true; - } - - pLed->CurrLedState =LED_BLINK_WPS_STOP ; -if (pLed->bLedOn) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); - }else { - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_STOP_WPS_FAIL : -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,0 ); -break ; -case LED_CTL_START_TO_LINK : -case LED_CTL_NO_LINK : -if (!IS_LED_BLINKING (pLed)) { - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,0 ); - } -break ; -case LED_CTL_POWER_OFF : - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - -_set_timer (&pLed->BlinkTimer,0 ); -break ; -default : -break ; - } -} - -/* Edimax-Belkin, added by chiyoko, 20090413 */ -static void SwLedControlMode4 (struct adapter *padapter,enum LED_CTL_MODE LedAction) -{ -struct led_priv *ledpriv = &padapter->ledpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &ledpriv->SwLed0; -struct LED_871x *pLed1 = &ledpriv->SwLed1; - -switch (LedAction) { -case LED_CTL_START_TO_LINK : -if (pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&pLed1->BlinkTimer); - - pLed1->BlinkingLedState =RTW_LED_OFF ; - pLed1->CurrLedState =RTW_LED_OFF ; - -if (pLed1->bLedOn) -_set_timer (&pLed->BlinkTimer,0 ); - } - -if (!pLed->bLedStartToLinkBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } - - pLed->bLedStartToLinkBlinkInProgress = true; - pLed->CurrLedState = LED_BLINK_StartToBlink; -if (pLed->bLedOn) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); - }else { - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); - } - } -break ; -case LED_CTL_LINK : -case LED_CTL_NO_LINK : -/* LED1 settings */ -if (LedAction ==LED_CTL_LINK ) { -if (pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&pLed1->BlinkTimer); - - pLed1->BlinkingLedState =RTW_LED_OFF ; - pLed1->CurrLedState =RTW_LED_OFF ; - -if (pLed1->bLedOn) -_set_timer (&pLed->BlinkTimer,0 ); - } - } - -if (!pLed->bLedNoLinkBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_SITE_SURVEY : -if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate (pmlmepriv, _FW_LINKED))) { - }else if (!pLed->bLedScanBlinkInProgress) { -if (IS_LED_WPS_BLINKING (pLed)) -return ; - -if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - pLed->bLedScanBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SCAN ; - pLed->BlinkTimes =24 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_TX : -case LED_CTL_RX : -if (!pLed->bLedBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; -if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } - pLed->bLedBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_TXRX ; - pLed->BlinkTimes =2 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_START_WPS :/* wait until xinpin finish */ -case LED_CTL_START_WPS_BOTTON : -if (pLed1->bLedWPSBlinkInProgress) { - pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&pLed1->BlinkTimer); - - pLed1->BlinkingLedState =RTW_LED_OFF ; - pLed1->CurrLedState =RTW_LED_OFF ; - -if (pLed1->bLedOn) -_set_timer (&pLed->BlinkTimer,0 ); - } - -if (!pLed->bLedWPSBlinkInProgress) { -if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } - pLed->bLedWPSBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_WPS ; -if (pLed->bLedOn) { - pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); - }else { - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); - } - } -break ; -case LED_CTL_STOP_WPS :/* WPS connect success */ -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - -break ; -case LED_CTL_STOP_WPS_FAIL :/* WPS authentication fail */ -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - -/* LED1 settings */ -if (pLed1->bLedWPSBlinkInProgress) -_cancel_timer_ex (&pLed1->BlinkTimer); -else - pLed1->bLedWPSBlinkInProgress = true; - pLed1->CurrLedState =LED_BLINK_WPS_STOP ; -if (pLed1->bLedOn) - pLed1->BlinkingLedState =RTW_LED_OFF ; -else - pLed1->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); -break ; -case LED_CTL_STOP_WPS_FAIL_OVERLAP :/* WPS session overlap */ -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); - -/* LED1 settings */ -if (pLed1->bLedWPSBlinkInProgress) -_cancel_timer_ex (&pLed1->BlinkTimer); -else - pLed1->bLedWPSBlinkInProgress = true; - pLed1->CurrLedState =LED_BLINK_WPS_STOP_OVERLAP ; - pLed1->BlinkTimes =10 ; -if (pLed1->bLedOn) - pLed1->BlinkingLedState =RTW_LED_OFF ; -else - pLed1->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); -break ; -case LED_CTL_POWER_OFF : - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; - -if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } -if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedLinkBlinkInProgress = false; - } -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedWPSBlinkInProgress = false; - } -if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } -if (pLed->bLedStartToLinkBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedStartToLinkBlinkInProgress = false; - } -if (pLed1->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&pLed1->BlinkTimer); - pLed1->bLedWPSBlinkInProgress = false; - } - pLed1->BlinkingLedState =LED_UNKNOWN ; -SwLedOff (padapter, pLed); -SwLedOff (padapter, pLed1); -break ; -default : -break ; - } -} - -/* Sercomm-Belkin, added by chiyoko, 20090415 */ -static void -SwLedControlMode5 ( -struct adapter *padapter, -enum LED_CTL_MODE LedAction -) -{ -struct led_priv *ledpriv = &padapter->ledpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &ledpriv->SwLed0; - -switch (LedAction) { -case LED_CTL_POWER_ON : -case LED_CTL_NO_LINK : -case LED_CTL_LINK :/* solid blue */ - pLed->CurrLedState =RTW_LED_ON ; - pLed->BlinkingLedState =RTW_LED_ON ; - -_set_timer (&pLed->BlinkTimer,0 ); -break ; -case LED_CTL_SITE_SURVEY : -if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate (pmlmepriv, _FW_LINKED))) { - }else if (!pLed->bLedScanBlinkInProgress) { -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - pLed->bLedScanBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SCAN ; - pLed->BlinkTimes =24 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_TX : -case LED_CTL_RX : -if (!pLed->bLedBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ) -return ; - pLed->bLedBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_TXRX ; - pLed->BlinkTimes =2 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); - } -break ; -case LED_CTL_POWER_OFF : - pLed->CurrLedState =RTW_LED_OFF ; - pLed->BlinkingLedState =RTW_LED_OFF ; - -if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } -SwLedOff (padapter, pLed); -break ; -default : -break ; - } -} - -/* WNC-Corega, added by chiyoko, 20090902 */ -static void -SwLedControlMode6 ( -struct adapter *padapter, -enum LED_CTL_MODE LedAction -) -{ -struct led_priv *ledpriv = &padapter->ledpriv; -struct LED_871x *pLed0 = &ledpriv->SwLed0; - -switch (LedAction) { -case LED_CTL_POWER_ON : -case LED_CTL_LINK : -case LED_CTL_NO_LINK : -_cancel_timer_ex (&pLed0->BlinkTimer); - pLed0->CurrLedState =RTW_LED_ON ; - pLed0->BlinkingLedState =RTW_LED_ON ; -_set_timer (&pLed0->BlinkTimer,0 ); -break ; -case LED_CTL_POWER_OFF : -SwLedOff (padapter, pLed0); -break ; -default : -break ; - } -} -void BlinkHandler (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter;
@@ -1063,28 +445,5 @@ void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction) LedAction == LED_CTL_POWER_ON))return ; -switch (ledpriv->LedStrategy) { -case SW_LED_MODE0 : -break ; -case SW_LED_MODE1 : -SwLedControlMode1 (padapter, LedAction); -break ; -case SW_LED_MODE2 : -SwLedControlMode2 (padapter, LedAction); -break ; -case SW_LED_MODE3 : -SwLedControlMode3 (padapter, LedAction); -break ; -case SW_LED_MODE4 : -SwLedControlMode4 (padapter, LedAction); -break ; -case SW_LED_MODE5 : -SwLedControlMode5 (padapter, LedAction); -break ; -case SW_LED_MODE6 : -SwLedControlMode6 (padapter, LedAction); -break ; -default : -break ; - } +SwLedControlMode1 (padapter, LedAction); }
Signature · 1 line
2.33.0
PATCH 3/5 staging: r8188eu: remove unnecessary comments
In reply to Michael StraubeThe function names in rtw_led.c are self-explanatory. Remove unnecessary comments.
--- drivers/staging/r8188eu/core/rtw_led.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/staging/r8188eu/core/rtw_led.c +0 -21
@@ -4,11 +4,6 @@#include "../include/drv_types.h" #include "../include/rtw_led.h" -/* */ -/* Description: */ -/* Callback function of LED BlinkTimer, */ -/* it just schedules to corresponding BlinkWorkItem/led_blink_hdl */ -/* */ void BlinkTimerCallback (struct timer_list *t) {struct LED_871x *pLed =from_timer (pLed, t, BlinkTimer);
@@ -20,21 +15,12 @@ void BlinkTimerCallback(struct timer_list *t)_set_workitem (&pLed->BlinkWorkItem); } -/* */ -/* Description: */ -/* Callback function of LED BlinkWorkItem. */ -/* We dispatch acture LED blink action according to LedStrategy. */ -/* */ void BlinkWorkItemCallback (struct work_struct *work) { struct LED_871x *pLed = container_of(work, struct LED_871x, BlinkWorkItem);BlinkHandler (pLed); } -/* */ -/* Description: */ -/* Reset status of LED_871x object. */ -/* */ void ResetLedStatus (struct LED_871x *pLed) { pLed->CurrLedState =RTW_LED_OFF ;/* Current LED state. */
@@ -52,8 +38,6 @@ void ResetLedStatus(struct LED_871x *pLed) pLed->bLedScanBlinkInProgress = false; } -/*Description: */ -/* Initialize an LED_871x object. */ void InitLed871x (struct adapter *padapter,struct LED_871x *pLed,enum LED_PIN_871x LedPin) { pLed->padapter = padapter;
@@ -65,10 +49,6 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8_init_workitem (&pLed->BlinkWorkItem, BlinkWorkItemCallback, pLed); } -/* */ -/* Description: */ -/* DeInitialize an LED_871x object. */ -/* */ void DeInitLed871x (struct LED_871x *pLed) {_cancel_workitem_sync (&pLed->BlinkWorkItem);
@@ -205,7 +185,6 @@ static void SwLedBlink1(struct LED_871x *pLed) } } -/* ALPHA, added by chiyoko, 20090106 */ static void SwLedControlMode1 (struct adapter *padapter,enum LED_CTL_MODE LedAction) {struct led_priv *ledpriv = &padapter->ledpriv;
Signature · 1 line
2.33.0
PATCH 4/5 staging: r8188eu: remove _InitHWLed()
In reply to Michael StraubeFunction _InitHWLed() does nothing, remove it.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -14
@@ -403,18 +403,6 @@ static void _InitEDCA(struct adapter *Adapter)rtw_write32 (Adapter,REG_EDCA_VO_PARAM ,0x002FA226 ); } -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 */ -} -static void _InitRDGSetting (struct adapter *Adapter) {rtw_write8 (Adapter,REG_RD_CTRL ,0xFF );
@@ -830,8 +818,6 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)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 */ -_InitHWLed (Adapter); -/* Keep RfRegChnlVal for later use. */ haldata->RfRegChnlVal[0 ] =PHY_QueryRFReg (Adapter, (enum rf_radio_path )0 ,RF_CHNLBW , bRFRegOffsetMask); haldata->RfRegChnlVal[1 ] =PHY_QueryRFReg (Adapter, (enum rf_radio_path )1 ,RF_CHNLBW , bRFRegOffsetMask);
Signature · 1 line
2.33.0
PATCH 5/5 staging: r8188eu: remove LedStrategy from struct led_priv
In reply to Michael StraubeLedStrategy is set but never used. Remove it from struct led_priv and remove the now unused enum LED_STRATEGY_871x as well.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - drivers/staging/r8188eu/include/rtw_led.h | 18 ------------------ 2 files changed, 19 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -1
@@ -1042,7 +1042,6 @@ static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool Autolstruct hal_data_8188e *haldata =GET_HAL_DATA (Adapter); pledpriv->bRegUseLed = true; - pledpriv->LedStrategy =SW_LED_MODE1 ; haldata->bLedOpenDrain = true;/* Support Open-drain arrangement for controlling the LED. */ }
drivers/staging/r8188eu/include/rtw_led.h +0 -18
@@ -127,30 +127,12 @@ struct LED_871x { (((struct LED_871x *)_LED_871x)->bLedWPSBlinkInProgress || \ ((struct LED_871x *)_LED_871x)->bLedScanBlinkInProgress) -/* LED customization. */ - -enum LED_STRATEGY_871x { -SW_LED_MODE0 =0 ,/* SW control 1 LED via GPIO0. It is default option.*/ -SW_LED_MODE1 =1 ,/* 2 LEDs, through LED0 and LED1. For ALPHA. */ -SW_LED_MODE2 =2 ,/* SW control 1 LED via GPIO0, customized for AzWave -* 8187 minicard. */ -SW_LED_MODE3 =3 ,/* SW control 1 LED via GPIO0, customized for Sercomm -* Printer Server case. */ -SW_LED_MODE4 =4 ,/* for Edimax / Belkin */ -SW_LED_MODE5 =5 ,/* for Sercomm / Belkin */ -SW_LED_MODE6 =6 ,/* for 88CU minicard, porting from ce SW_LED_MODE7 */ -HW_LED =50 ,/* HW control 2 LEDs, LED0 and LED1 (there are 4 -* different control modes, see MAC.CONFIG1 for details.)*/ -LED_ST_NONE =99 , -}; -void LedControl8188eu (struct adapter *padapter,enum LED_CTL_MODE LedAction);struct led_priv {/* add for led control */ struct LED_871x SwLed0;struct LED_871x SwLed1; -enum LED_STRATEGY_871x LedStrategy;u8 bRegUseLed;void (*LedControlHandler)(struct adapter *padapter,enum LED_CTL_MODE LedAction);
Signature · 1 line
2.33.0