Commit 0f8d4adc authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove dead led control functions 



LedStrategy is SW_LED_MODE1 in this driver. Remove led control
functions that are not used for SW_LED_MODE1.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210924204917.6313-3-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d344819e

drivers/staging/r8188eu/core/rtw_led.c

+1 −642
Original line number Diff line number Diff line
@@ -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;

	}

}