http://downloads.netgear.com/files/GPL/DM111PSP_v3.61d_GPL.tar.gz

[bcm963xx.git] / bcmdrivers / opensource / char / board / bcm963xx / impl1 / bcm63xx_led.c

diff --git a/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_led.c b/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_led.c
index e612115..2936f1c 100755 (executable)
--- a/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_led.c
+++ b/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_led.c
@@ -350,7 +350,7 @@ void __init boardLedInit(PLED_MAP_PAIR cLedMapping)
 #endif
 #if defined(CONFIG_BCM96358)
     /* Enable LED Outputs */
-    //GPIO->GPIOMode |= GPIO_MODE_LED_OVERLAY; USR9109
+    GPIO->GPIOMode |= GPIO_MODE_LED_OVERLAY;
     GPIO->GPIODir |= 0x000f;
     /* Enable Serial LED Outputs */
     GPIO->GPIOMode |= GPIO_MODE_SERIAL_LED_OVERLAY;
@@ -551,11 +551,7 @@ void boardLedCtrl(BOARD_LED_NAME ledName, BOARD_LED_STATE ledState)
     // in the board parameters, change the state to kLedStateSlowBlinkContinues.
     if( ledState == kLedStateFail && ledInfoPtr->ledMaskFail == 0 )
         ledState = kLedStateSlowBlinkContinues;
-#if (0) // USR9108    
-    if( ledName != kLedWanData )
-        printk("LEDCTRL: Led %d state %d mask %x\n", 
-               ledName, ledState, ledInfoPtr->ledMask);
-#endif
+
     switch (ledState)
     {
         case kLedStateOn:
@@ -595,13 +591,11 @@ void boardLedCtrl(BOARD_LED_NAME ledName, BOARD_LED_STATE ledState)
             break;
 
         case kLedStateBlinkOnce:
-            // USR9108 Blink only if Led is On! 
             // skip blinkOnce if it is already in Slow/Fast blink continues state
-//            if (ledInfoPtr->savedLedState == kLedStateSlowBlinkContinues ||
-//                ledInfoPtr->savedLedState == kLedStateFastBlinkContinues)
-//                ;
-//            else
-            if ( ledInfoPtr->savedLedState == kLedStateOn )
+            if (ledInfoPtr->savedLedState == kLedStateSlowBlinkContinues ||
+                ledInfoPtr->savedLedState == kLedStateFastBlinkContinues)
+                ;
+            else
             {
                 if ( ledInfoPtr->blinkCountDown ||  // skip the call if it is 1
                      gBlinkOnceTimerOn            ) // Keven -- skip the call if BlinkOnceTimer is on