brcm63xx: set status leds from within diag.sh

Instead of setting them up on invocation of brcm63xx_detect, set them
when calling diag.sh based.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 44837

diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/brcm63xx/base-files/etc/diag.sh
index f6a65d110751980edd9c6f155acf4d84e6b8e14f..928c02ba1078274e670d3e3722ff5f7b93bc4572 100644 (file)
--- a/target/linux/brcm63xx/base-files/etc/diag.sh
+++ b/target/linux/brcm63xx/base-files/etc/diag.sh
@@ -5,6 +5,103 @@
 . /lib/brcm63xx.sh
 
 set_state() {
+       case "$(brcm63xx_board_name)" in
+       a4001n1)
+               status_led="A4001N1:green:power"
+               ;;
+       a4001n)
+               status_led="A4001N:green:power"
+               ;;
+       ar-5381u)
+               status_led="AR-5381u:green:power"
+               ;;
+       ar-5387un)
+               status_led="AR-5387un:green:power"
+               ;;
+       bcm96348gw)
+               status_led="96348GW:green:power"
+               ;;
+       bcm963281tan)
+               status_led="963281TAN::power"
+               ;;
+       bcm96328avng)
+               status_led="96328avng::power"
+               ;;
+       bcm96348gw-11)
+               status_led="96348GW-11:green:power"
+               ;;
+       spw303v)
+               status_led="spw303v:green:power+adsl"
+               ;;
+       vr-3025un)
+               status_led="VR-3025un:green:power"
+               ;;
+       vr-3025u)
+               status_led="VR-3025u:green:power"
+               ;;
+       wap-5813n)
+               status_led="WAP-5813n:green:power"
+               ;;
+       ar1004g)
+               status_led="AR1004G:green:power"
+               ;;
+       dsl-274xb-c)
+               status_led="dsl-274xb:green:power"
+               ;;
+       dsl-275xb-d)
+               status_led="dsl-275xb:green:power"
+               ;;
+       cpva642)
+               status_led="CPVA642:green:power:"
+               ;;
+       ct536_ct5621)
+               status_led="CT536_CT5621:green:power"
+               ;;
+       cvg834g)
+               status_led="CVG834G:green:power"
+               ;;
+       dsl-2640b-b)
+               status_led="D-4P-W:green:power"
+               ;;
+       dgnd3700v1_dgnd3800b)
+               status_led="DGND3700v1_3800B:green:power"
+               ;;
+       fast2504n)
+               status_led="fast2504n:green:ok"
+               ;;
+       fast2704v2)
+               status_led="F@ST2704V2:green:power"
+               ;;
+       gw6200)
+               status_led="GW6200:green:line1"
+               status_led2="GW6200:green:tel"
+               ;;
+       hg553)
+               status_led="HW553:blue:power"
+               ;;
+       hg556a_*)
+               status_led="HW556:red:power"
+               ;;
+       hg520)
+               status_led="HW520:green:net"
+               ;;
+       p870hw-51a_v2)
+               status_led="P870HW-51a:green:power"
+               ;;
+       rta770bw)
+               status_led="RTA770BW:green:diag"
+               ;;
+       rta770w)
+               status_led="RTA770W:green:diag"
+               ;;
+       spw500v)
+               status_led="SPW500V:green:power"
+               ;;
+       v2110)
+               status_led="V2110:power:green"
+               ;;
+       esac
+
        case "$1" in
        preinit)
                status_led_set_timer 200 200

diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index d780eb40988a056c43554a9b6aeabf67304daca5..af4036a5109630fcb066d8fbfa5f158ad4dd4271 100755 (executable)
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -5,8 +5,6 @@
 #
 
 board_id=""
-status_led=""
-status_led2=""
 sys_mtd_part=""
 brcm63xx_has_reset_button=""
 ifname=""
@@ -260,108 +258,86 @@ brcm63xx_detect() {
 
        case "$board_name" in
        bcm963281tan)
-               status_led="963281TAN::power"
                ifname=eth0
                ;;
        a4001n1)
                brcm63xx_has_reset_button="true"
-               status_led="A4001N1:green:power"
                ifname=eth0
                ;;
        bcm96328avng)
-               status_led="96328avng::power"
                ifname=eth0
                ;;
        a4001n)
                brcm63xx_has_reset_button="true"
-               status_led="A4001N:green:power"
                ifname="eth0"
                ;;
        ar-5381u)
                brcm63xx_has_reset_button="true"
-               status_led="AR-5381u:green:power"
                ifname=eth0
                ;;
        ar-5387un)
                brcm63xx_has_reset_button="true"
-               status_led="AR-5387un:green:power"
                ifname=eth0
                ;;
        bcm96348gw)
-               status_led="96348GW:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth1
                ;;
        bcm96348gw-11)
-               status_led="96348GW-11:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth1
                ;;
        spw303v)
-               status_led="spw303v:green:power+adsl"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        vr-3025un)
                brcm63xx_has_reset_button="true"
-               status_led="VR-3025un:green:power"
                ifname="eth0"
                ;;
        vr-3025u)
                brcm63xx_has_reset_button="true"
-               status_led="VR-3025u:green:power"
                ifname="eth0"
                ;;
        wap-5813n)
                brcm63xx_has_reset_button="true"
-               status_led="WAP-5813n:green:power"
                ifname="eth0"
                ;;
        ar1004g)
-               status_led="AR1004G:green:power"
                brcm63xx_has_reset_button="true"
                ;;
        dsl-274xb-c)
-               status_led="dsl-274xb:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        dsl-275xb-d)
-               status_led="dsl-275xb:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        cpva642)
-               status_led="CPVA642:green:power:"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        ct536_ct5621)
-               status_led="CT536_CT5621:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        cvg834g)
-               status_led="CVG834G:green:power"
                ifname=eth0
                ;;
        dsl-2640b-b)
-               status_led="D-4P-W:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        dgnd3700v1_dgnd3800b)
-               status_led="DGND3700v1_3800B:green:power"
                brcm63xx_has_reset_button="true"
                ifname="eth0"
                ;;
        fast2504n)
-               status_led="fast2504n:green:ok"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        fast2704v2)
-               status_led="F@ST2704V2:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
@@ -370,23 +346,18 @@ brcm63xx_detect() {
                ifname=eth1
                ;;
        gw6200)
-               status_led="GW6200:green:line1"
-               status_led2="GW6200:green:tel"
                brcm63xx_has_reset_button="true"
                ifname=eth1
                ;;
        hg553)
-               status_led="HW553:blue:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        hg556a_*)
-               status_led="HW556:red:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        hg520)
-               status_led="HW520:green:net"
                brcm63xx_has_reset_button="true"
                ifname="eth0"
                ;;
@@ -396,26 +367,21 @@ brcm63xx_detect() {
                ;;
        p870hw-51a_v2)
                brcm63xx_has_reset_button="true"
-               status_led="P870HW-51a:green:power"
                ifname="eth0"
                ;;
        rta770bw)
                brcm63xx_has_reset_button="true"
-               status_led="RTA770BW:green:diag"
                ifname=eth0
                ;;
        rta770w)
                brcm63xx_has_reset_button="true"
-               status_led="RTA770W:green:diag"
                ifname=eth0
                ;;
        spw500v)
-               status_led="SPW500V:green:power"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;
        v2110)
-               status_led="V2110:power:green"
                brcm63xx_has_reset_button="true"
                ifname=eth0
                ;;