ramips: use consistent naming scheme for LEDs

The upstream LED naming convention is "device:color:led-name", but it seems that many of supported boards in OpenWrt don't follow this approach.
The following patch fixes this inconsistency in dts{,i} files and updates base-files scripts for ramips target:
 * fixes wrong indentation
 * keeps case statements structure in same convention as in other scripts (no empty line after ";;", no indentation for case...esac body)
 * fixes wrong LED names for some of boards (makes them the same as in dts{,i} files)
 * combines boards with same configuration (ex. set_wifi_led "rt2800pci-phy0::radio" in 01_leds)

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

SVN-Revision: 46664

2 files changed, 427 insertions, 345 deletions

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index e872b39ffe..c8256dbdb6 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -17,257 +17,275 @@ board=$(ramips_board_name)
 board_config_update
 
 case $board in
-	3g-6200n)
-		set_wifi_led "edimax:amber:wlan"
-		set_usb_led "edimax:blue:3g"
-		;;
-	3g-6200nl)
-		set_wifi_led "edimax:green:wlan"
-		;;
-	3g150b |\
-	3g300m)
-		set_usb_led "tenda:blue:3g"
-		;;
-	ai-br100)
-		ucidef_set_led_netdev "wan" "wan" "aigale:blue:wan" "eth0.2"
-		set_wifi_led "aigale:blue:wlan"
-		;;
-	a5-v11)
-		ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
-		;;
-	air3gii)
-		set_wifi_led "airlive:green:wlan"
-		set_usb_led "airlive:green:mobile"
-		;;
-	all0256n)
-		ucidef_set_rssimon "wlan0" "40000" "1"
-		ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
-		ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
-		ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ar670w|\
-	ar725w|\
-	awapn2403)
-		set_wifi_led "rt2800soc-phy0::radio"
-		;;
-	asl26555)
-		ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
-		set_wifi_led "asl26555:green:wlan"
-		set_usb_led "asl26555:green:3g"
-		;;
-	bc2)
-		set_usb_led "bc2:blue:usb"
-		;;
-	br-6425)
-		set_wifi_led "edimax:orange:wlan"
-		;;
-	br-6475nd)
-		set_wifi_led "edimax:amber:wlan"
-		;;
-	broadway)
-		set_usb_led "red:diskmounted"
-		set_wifi_led "red:wps_active"
-		;;
-	cf-wr800n)
-		ucidef_set_led_netdev "lan" "lan" "comfast:white:ethernet" eth0.1
-		set_wifi_led "comfast:white:wifi"
-		;;
-	cy-swr1100)
-		ucidef_set_led_default "wps" "WPS" "samsung:blue:wps" "0"
-		set_usb_led "samsung:blue:usb"
-		;;
-	d105)
-		ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
-		set_usb_led "d105:green:usb"
-		;;
-	dcs-930l-b1)
-		ucidef_set_led_default "power" "POWER" "d-link:red:power" "1"
-		ucidef_set_led_netdev "wifi" "WiFi" "d-link:blue:wps"
-		;;
-	dir-300-b1|\
-	dir-600-b1|\
-	dir-600-b2|\
-	dir-620-a1)
-		# ANDed with vlan switch port 4 led state
-		ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-615-d|\
-	dir-615-h1)
-		ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-620-d1)
-		set_wifi_led "d-link:green:wifi"
-		;;
-	dir-810l)
-		ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
-		;;
-	dir-610-a1 |\
-	dir-300-b7 |\
-	dir-320-b1 |\
-	esr-9753)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	f5d8235-v1)
-		set_usb_led "f5d8235-v1:blue:storage"
-		;;
-	f5d8235-v2)
-		set_usb_led "f5d8235v2:blue:storage"
-		;;
-	fonera20n)
-		set_usb_led "fonera20n:orange:usb"
-		set_wifi_led "fonera20n:orange:wifi"
-		;;
-	hlk-rm04)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ht-tm02)
-		ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
-		set_wifi_led "ht-tm02:blue:wlan"
-		;;
-	all0239-3g|\
-	hw550-3g)
-		set_usb_led "hw550-3g:green:usb"
-		;;
-	mlw221|\
-	mlwg2)
-		set_wifi_led "kingston:blue:wifi"
-		ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
-		;;
-	mofi3500-3gn)
-		set_usb_led "mofi3500-3gn:green:usb"
-		;;
-	mpr-a1)
-		set_wifi_led "hame:blue:system"
-		;;
-	mpr-a2)
-		set_wifi_led "hame:blue:system"
-		;;
-	mr-102n)
-		set_wifi_led "mr-102n:green:wlan"
-		set_usb_led "mr-102n:green:usb"
-		;;
-	mzk-w300nh2)
-		set_wifi_led "mzkw300nh2:amber:wlan"
-		;;
-	na930)
-		set_usb_led "na930:blue:status"
-		;;
-	nw718)
-		set_usb_led "nw718:amber:usb"
-		;;
-	m2m)
-		set_wifi_led "m2m:blue:wifi"
-		ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
-		;;
-	hpm)
-		ucidef_set_led_default "power" "POWER" "hpm:orange:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "hpm:green:eth" "eth0"
-		set_wifi_led "hpm:green:wifi"
-		;;
-	miniembplug)
-		set_wifi_led "miniembplug:green:wlan"
-		set_usb_led "miniembplug:green:mobile"
-		;;
-	px-4885)
-		set_wifi_led "px-4885:orange:wifi"
-		set_usb_led "px-4885:blue:storage"
-		;;
-    pbr-m1)
-        ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
-        ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
-        ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
-        ;;
-	sap-g3200u3)
-		set_usb_led "storylink:green:usb"
-		;;
-	sl-r7205)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	v11st-fe)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	vocore)
-		ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
-		set_wifi_led "vocore:green:status"
-		;;
-	w306r-v20)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	w502u)
-		set_usb_led "alfa:blue:usb"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wcr-150gn)
-		set_usb_led "wcr150gn:amber:user"
-		;;
-	hg255d)
-		set_wifi_led "hg255d:wlan"
-		set_usb_led "hg255d:usb"
-		ucidef_set_led_interface "lan" "hg255d:internet"
-		;;
-	wnce2001)
-		set_wifi_led "netgear:green:wlan"
-		;;
-	re6500)
-		ucidef_set_led_default "power" "power" "linksys:white:power" "1"
-		ucidef_set_led_default "wifi" "wifi" "linksys:orange:wifi" "1"
-		;;
-	rt-n14u)
-		ucidef_set_led_default "power" "power" "asus:blue:power" "1"
-		ucidef_set_led_netdev "lan" "lan" "asus:blue:lan" eth0.1
-		ucidef_set_led_netdev "wan" "wan" "asus:blue:wan" eth0.2
-		set_wifi_led "asus:blue:air"
-		set_usb_led "asus:blue:usb"
-		;;
-	rp-n53)
-		ucidef_set_led_netdev "eth" "Network" "asus:white:back" "eth0"
-		set_wifi_led "asus:blue:wifi"
-		;;
-	whr-300hp2 |\
-	whr-600d |\
-	whr-1166d)
-		ucidef_set_led_default "power" "power" "buffalo:green:power" "1"
-		ucidef_set_led_default "router" "router" "buffalo:green:router" "1"
-		;;
-	zbt-wa05)
-		ucidef_set_led_default "power" "power" "zbtlink:blue:power" "1"
-		set_wifi_led "zbtlink:blue:air"
-		set_usb_led "zbtlink:blue:usb"
-		;;
-	oy-0001)
-		ucidef_set_led_default "power" "power" "oy:green:power" "1"
-		set_wifi_led "oy:green:wifi"
-		;;
-	zbt-wr8305rt)
-		ucidef_set_led_default "power" "power" "zbt-wr8305rt:sys" "1"
-		set_usb_led "zbt-wr8305rt:usb"
-		set_wifi_led "zbt-wr8305rt:wifi"
-		;;
-	wt1520)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wt3020)
-		ucidef_set_led_default "power" "power" "nexx:blue:power" "0"
-		;;
-	miwifi-mini)
-		ucidef_set_led_default "power" "power" "miwifi-mini:red:status" "1"
-		;;
-	y1 |\
-	y1s)
-		ucidef_set_led_default "power" "power" "lenovo:blue:power" "1"
-		set_usb_led "lenovo:blue:usb"
-		set_wifi_led "lenovo:blue:wifi"
-		;;
-	zte-q7)
-		set_wifi_led "zte:blue:status"
-		;;
-	mzk-dp150n)
-		ucidef_set_led_default "power" "power" "mzkdp150n:green:power" "1"
-		;;
+3g150b)
+	set_usb_led "3g150b:blue:3g"
+	;;
+3g300m)
+	set_usb_led "3g300m:blue:3g"
+	;;
+3g-6200n)
+	set_wifi_led "3g-6200n:amber:wlan"
+	set_usb_led "3g-6200n:blue:3g"
+	;;
+3g-6200nl)
+	set_wifi_led "3g-6200nl:amber:wlan"
+	;;
+a5-v11)
+	ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
+	;;
+ai-br100)
+	ucidef_set_led_netdev "wan" "wan" "ai-br100:blue:wan" "eth0.2"
+	set_wifi_led "ai-br100:blue:wlan"
+	;;
+air3gii)
+	set_wifi_led "air3gii:green:wlan"
+	set_usb_led "air3gii:green:mobile"
+	;;
+all0239-3g)
+	set_usb_led "all0239-3g:green:usb"
+	;;
+all0256n)
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+ar670w|\
+ar725w|\
+awapn2403)
+	set_wifi_led "rt2800soc-phy0::radio"
+	;;
+asl26555)
+	ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
+	set_wifi_led "asl26555:green:wlan"
+	set_usb_led "asl26555:green:3g"
+	;;
+bc2)
+	set_usb_led "bc2:blue:usb"
+	;;
+br-6425)
+	set_wifi_led "br-6425:orange:wlan"
+	;;
+br-6475nd)
+	set_wifi_led "br-6475nd:amber:wlan"
+	;;
+broadway)
+	set_usb_led "broadway:red:diskmounted"
+	set_wifi_led "broadway:red:wps_active"
+	;;
+cf-wr800n)
+	ucidef_set_led_netdev "lan" "lan" "cf-wr800n:white:ethernet" eth0.1
+	set_wifi_led "cf-wr800n:white:wifi"
+	;;
+cy-swr1100)
+	ucidef_set_led_default "wps" "WPS" "cy-swr1100:blue:wps" "0"
+	set_usb_led "cy-swr1100:blue:usb"
+	;;
+d105)
+	ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
+	set_usb_led "d105:green:usb"
+	;;
+dcs-930l-b1)
+	ucidef_set_led_default "power" "POWER" "dcs-930l-b1:red:power" "1"
+	ucidef_set_led_netdev "wifi" "WiFi" "dcs-930l-b1:blue:wps"
+	;;
+dir-300-b1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-300-b1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-300-b7|\
+dir-320-b1|\
+dir-610-a1|\
+esr-9753|\
+hlk-rm04|\
+sl-r7205|\
+v11st-fe|\
+w306r-v20|\
+wt1520)
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-600-b1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-600-b1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-600-b2)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-600-b2:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-615-d)
+	ucidef_set_led_default "status" "Status LED (amber)" "dir-615-d:amber:status" "0"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-615-h1)
+	ucidef_set_led_default "status" "Status LED (amber)" "dir-615-h1:amber:status" "0"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-620-a1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-620-a1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-620-d1)
+	set_wifi_led "dir-620-d1:green:wifi"
+	;;
+dir-810l)
+	ucidef_set_led_default "power" "POWER" "dir-810l:green:power" "1"
+	;;
+f5d8235-v1)
+	set_usb_led "f5d8235-v1:blue:storage"
+	;;
+f5d8235-v2)
+	set_usb_led "f5d8235-v2:blue:storage"
+	;;
+fonera20n)
+	set_usb_led "fonera20n:orange:usb"
+	set_wifi_led "fonera20n:orange:wifi"
+	;;
+hg255d)
+	set_wifi_led "hg255d:green:wlan"
+	set_usb_led "hg255d:green:usb"
+	ucidef_set_led_interface "lan" "hg255d:green:internet"
+	;;
+hpm)
+	ucidef_set_led_default "power" "POWER" "hpm:orange:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "hpm:green:eth" "eth0"
+	set_wifi_led "hpm:green:wifi"
+	;;
+ht-tm02)
+	ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
+	set_wifi_led "ht-tm02:blue:wlan"
+	;;
+hw550-3g)
+	set_usb_led "hw550-3g:green:usb"
+	;;
+m2m)
+	set_wifi_led "m2m:blue:wifi"
+	ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
+	;;
+miniembplug)
+	set_wifi_led "miniembplug:red:wlan"
+	set_usb_led "miniembplug:green:mobile"
+	;;
+miwifi-mini)
+	ucidef_set_led_default "power" "power" "miwifi-mini:red:status" "1"
+	;;
+mlw221)
+	set_wifi_led "mlw221:blue:wifi"
+	ucidef_set_led_default "system" "system" "mlw221:blue:system" "1"
+	;;
+mlwg2)
+	set_wifi_led "mlwg2:blue:wifi"
+	ucidef_set_led_default "system" "system" "mlwg2:blue:system" "1"
+	;;
+mofi3500-3gn)
+	set_usb_led "mofi3500-3gn:green:usb"
+	;;
+mpr-a1)
+	set_wifi_led "mpr-a1:blue:system"
+	;;
+mpr-a2)
+	set_wifi_led "mpr-a2:blue:system"
+	;;
+mr-102n)
+	set_wifi_led "mr-102n:green:wlan"
+	set_usb_led "mr-102n:green:usb"
+	;;
+mzk-dp150n)
+	ucidef_set_led_default "power" "power" "mzk-dp150n:green:power" "1"
+	;;
+mzk-w300nh2)
+	set_wifi_led "mzk-w300nh2:amber:wlan"
+	;;
+na930)
+	set_usb_led "na930:blue:status"
+	;;
+nw718)
+	set_usb_led "nw718:amber:usb"
+	;;
+oy-0001)
+	ucidef_set_led_default "power" "power" "oy-0001:green:power" "1"
+	set_wifi_led "oy-0001:green:wifi"
+	;;
+pbr-m1)
+	ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
+	ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
+	ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
+	;;
+px-4885)
+	set_wifi_led "px-4885:orange:wifi"
+	set_usb_led "px-4885:blue:storage"
+	;;
+re6500)
+	ucidef_set_led_default "power" "power" "re6500:white:power" "1"
+	ucidef_set_led_default "wifi" "wifi" "re6500:orange:wifi" "1"
+	;;
+rp-n53)
+	ucidef_set_led_netdev "eth" "Network" "rp-n53:white:back" "eth0"
+	set_wifi_led "rp-n53:blue:wifi"
+	;;
+rt-n14u)
+	ucidef_set_led_default "power" "power" "rt-n14u:blue:power" "1"
+	ucidef_set_led_netdev "lan" "lan" "rt-n14u:blue:lan" eth0.1
+	ucidef_set_led_netdev "wan" "wan" "rt-n14u:blue:wan" eth0.2
+	set_wifi_led "rt-n14u:blue:air"
+	set_usb_led "rt-n14u:blue:usb"
+	;;
+sap-g3200u3)
+	set_usb_led "sap-g3200u3:green:usb"
+	;;
+vocore)
+	ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
+	set_wifi_led "vocore:green:status"
+	;;
+w502u)
+	set_usb_led "w502u:blue:usb"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+wcr-150gn)
+	set_usb_led "wcr-150gn:amber:user"
+	;;
+whr-1166d)
+	ucidef_set_led_default "power" "power" "whr-1166d:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-1166d:green:router" "1"
+	;;
+whr-300hp2)
+	ucidef_set_led_default "power" "power" "whr-300hp2:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-300hp2:green:router" "1"
+	;;
+whr-600d)
+	ucidef_set_led_default "power" "power" "whr-600d:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-600d:green:router" "1"
+	;;
+wnce2001)
+	set_wifi_led "wnce2001:green:wlan"
+	;;
+wt3020)
+	ucidef_set_led_default "power" "power" "wt3020:blue:power" "0"
+	;;
+y1)
+	ucidef_set_led_default "power" "power" "y1:blue:power" "1"
+	set_usb_led "y1:blue:usb"
+	set_wifi_led "y1:blue:wifi"
+	;;
+y1s)
+	ucidef_set_led_default "power" "power" "y1s:blue:power" "1"
+	set_usb_led "y1s:blue:usb"
+	set_wifi_led "y1s:blue:wifi"
+	;;
+zbt-wa05)
+	ucidef_set_led_default "power" "power" "zbt-wa05:blue:power" "1"
+	set_wifi_led "zbt-wa05:blue:air"
+	set_usb_led "zbt-wa05:blue:usb"
+	;;
+zbt-wr8305rt)
+	ucidef_set_led_default "power" "power" "zbt-wr8305rt:green:sys" "1"
+	set_usb_led "zbt-wr8305rt:green:usb"
+	set_wifi_led "zbt-wr8305rt:green:wifi"
+	;;
+zte-q7)
+	set_wifi_led "zte-q7:blue:status"
+	;;
 esac
 
 board_config_flush
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index b776070e06..e9b8744090 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -6,17 +6,23 @@
 
 get_status_led() {
 	case $(ramips_board_name) in
-	3g-6200n)
-		status_led="edimax:green:power"
+	3g150b)
+		status_led="3g150b:blue:ap"
+		;;
+	3g300m)
+		status_led="3g300m:blue:ap"
 		;;
-	3g150b | 3g300m | w150m)
-		status_led="tenda:blue:ap"
+	3g-6200n)
+		status_led="3g-6200n:green:power"
 		;;
 	a5-v11)
 		status_led="a5-v11:red:power"
 		;;
 	ai-br100)
-		status_led="aigale:blue:wlan"
+		status_led="ai-br100:blue:wlan"
+		;;
+	all0239-3g)
+		status_led="all0239-3g:green:status"
 		;;
 	ar670w)
 		status_led="ar670w:green:power"
@@ -24,67 +30,102 @@ get_status_led() {
 	ar725w)
 		status_led="ar725w:green:power"
 		;;
-	awapn2403)
-		status_led="asiarf:green:wps"
+	asl26555)
+		status_led="asl26555:green:power"
 		;;
 	atp-52b)
 		status_led="atp-52b:green:run"
 		;;
-	asl26555)
-		status_led="asl26555:green:power"
+	awapn2403)
+		status_led="awapn2403:green:wps"
+		;;
+	br-6425)
+		status_led="br-6425:green:power"
 		;;
-	br-6425 | br-6475nd)
-		status_led="edimax:green:power"
+	br-6475nd)
+		status_led="br-6475nd:green:power"
 		;;
 	cf-wr800n)
-		status_led="comfast:white:wps"
+		status_led="cf-wr800n:white:wps"
 		;;
 	cy-swr1100)
-		status_led="samsung:blue:wps"
+		status_led="cy-swr1100:blue:wps"
 		;;
 	d105)
 		status_led="d105:red:power"
 		;;
-	dcs-930 | dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-610-a1 | dir-615-h1 | dir-615-d | dir-620-a1| dir-620-d1| dir-300-b7| dir-320-b1)
-		status_led="d-link:green:status"
+	dap-1350)
+		status_led="dap-1350:blue:power"
+		;;
+	dcs-930)
+		status_led="dcs-930:green:status"
 		;;
 	dcs-930l-b1)
-		status_led="d-link:red:power"
+		status_led="dcs-930l-b1:red:power"
 		;;
-	dir-645)
-		status_led="d-link:green:wps"
+	dir-300-b1)
+		status_led="dir-300-b1:green:status"
 		;;
-	dap-1350)
-		status_led="d-link:blue:power"
+	dir-300-b7)
+		status_led="dir-300-b7:green:status"
+		;;
+	dir-320-b1)
+		status_led="dir-320-b1:green:status"
+		;;
+	dir-600-b1)
+		status_led="dir-600-b1:green:status"
+		;;
+	dir-600-b2)
+		status_led="dir-600-b2:green:status"
+		;;
+	dir-610-a1)
+		status_led="dir-610-a1:green:status"
+		;;
+	dir-615-d)
+		status_led="dir-615-d:green:status"
+		;;
+	dir-615-h1)
+		status_led="dir-615-h1:green:status"
+		;;
+	dir-620-a1)
+		status_led="dir-620-a1:green:status"
+		;;
+	dir-620-d1)
+		status_led="dir-620-d1:green:status"
+		;;
+	dir-645)
+		status_led="dir-645:green:wps"
 		;;
 	e1700)
-		status_led="linksys:green:power"
+		status_led="e1700:green:power"
 		;;
 	esr-9753)
 		status_led="esr-9753:orange:power"
 		;;
 	f5d8235-v2)
-		status_led="f5d8235v2:blue:router"
+		status_led="f5d8235-v2:blue:router"
+		;;
+	f7c027)
+		status_led="f7c027:orange:status"
 		;;
 	fonera20n)
 		status_led="fonera20n:green:power"
 		;;
-	ip2202)
-		status_led="ip2202:green:run"
-		;;
-	rt-n13u)
-		status_led="rt-n13u:power"
-		;;
 	hlk-rm04)
 		status_led="hlk-rm04:red:power"
 		;;
+	hpm)
+		status_led="hpm:green:status"
+		;;
 	ht-tm02)
 		status_led="ht-tm02:blue:wlan"
 		;;
-	all0239-3g|\
 	hw550-3g)
 		status_led="hw550-3g:green:status"
 		;;
+	ip2202)
+		status_led="ip2202:green:run"
+		;;
 	m2m)
 		status_led="m2m:blue:wifi"
 		;;
@@ -94,33 +135,47 @@ get_status_led() {
 	m4)
 		status_led="m4:blue:status"
 		;;
-	mlw221|\
+	miniembwifi)
+		status_led="miniembwifi:green:status"
+		;;
+	miwifi-mini)
+		status_led="miwifi-mini:red:status"
+		;;
+	mlw221)
+		status_led="mlw221:blue:system"
+		;;
 	mlwg2)
-		status_led="kingston:blue:system"
+		status_led="mlwg2:blue:system"
 		;;
 	mofi3500-3gn)
 		status_led="mofi3500-3gn:green:status"
 		;;
 	mpr-a1)
-		status_led="hame:red:power"
+		status_led="mpr-a1:red:power"
 		;;
 	mpr-a2)
-		status_led="hame:red:power"
+		status_led="mpr-a2:red:power"
 		;;
 	mr-102n)
 		status_led="mr-102n:amber:status"
 		;;
+	mzk-dp150n)
+		status_led="mzk-dp150n:green:power"
+		;;
+	mzk-w300nh2)
+		status_led="mzk-w300nh2:green:power"
+		;;
+	na930)
+		status_led="na930:blue:power"
+		;;
 	nbg-419n)
 		status_led="nbg-419n:green:power"
 		;;
 	nw718)
 		status_led="nw718:amber:cpu"
 		;;
-	miniembwifi)
-		status_led="miniembwifi:green:status"
-		;;
-	hpm)
-		status_led="hpm:green:status"
+	oy-0001)
+		status_led="oy-0001:green:wifi"
 		;;
 	pbr-m1)
 		status_led="pbr-m1:green:sys"
@@ -135,29 +190,43 @@ get_status_led() {
 		status_led="px-4885:orange:wifi"
 		;;
 	re6500)
-		status_led="linksys:orange:wifi"
+		status_led="re6500:orange:wifi"
+		;;
+	rt-n10-plus)
+		status_led="rt-n10-plus:green:wps"
+		;;
+	rt-n13u)
+		status_led="rt-n13u:blue:power"
+		;;
+	rt-n14u)
+		status_led="rt-n14u:blue:power"
 		;;
 	rt-n15)
 		status_led="rt-n15:blue:power"
 		;;
-	rt-n10-plus)
-		status_led="asus:green:wps"
-		;;
-	rt-n14u | rt-n56u | wl-330n | wl-330n3g)
-		status_led="asus:blue:power"
+	rt-n56u)
+		status_led="rt-n56u:blue:power"
 		;;
 	rut5xx)
 		status_led="rut5xx:green:status"
 		;;
 	sap-g3200u3)
-		status_led="storylink:green:usb"
+		status_led="sap-g3200u3:green:usb"
 		;;
 	sl-r7205)
-		status_led="sl-r7205:green:status"
+		status_led="sl-r7205:green:wifi"
+		;;
+	tew-691gr)
+		status_led="tew-691gr:green:wps"
 		;;
-	tew-691gr|\
 	tew-692gr)
-		status_led="trendnet:green:wps"
+		status_led="tew-692gr:green:wps"
+		;;
+	ur-326n4g)
+		status_led="ur-326n4g:green:wps"
+		;;
+	ur-336un)
+		status_led="ur-336un:green:wps"
 		;;
 	v11st-fe)
 		status_led="v11st-fe:green:status"
@@ -168,57 +237,62 @@ get_status_led() {
 	vocore)
 		status_led="vocore:green:status"
 		;;
+	w150m)
+		status_led="w150m:blue:ap"
+		;;
 	w306r-v20)
 		status_led="w306r-v20:green:sys"
 		;;
 	w502u)
-		status_led="alfa:blue:wps"
+		status_led="w502u:blue:wps"
 		;;
 	wcr-150gn)
-		status_led="wcr150gn:amber:power"
+		status_led="wcr-150gn:amber:power"
+		;;
+	whr-1166d)
+		status_led="whr-1166d:orange:wifi"
+		;;
+	whr-300hp2)
+		status_led="whr-300hp2:orange:wifi"
+		;;
+	whr-600d)
+		status_led="whr-600d:orange:wifi"
 		;;
 	whr-g300n)
 		status_led="whr-g300n:green:router"
 		;;
-	wmr-300)
-		status_led="wmr-300:green:status"
-		;;
-	wli-tx4-ag300n)
-		status_led="buffalo:blue:power"
+	wl-330n)
+		status_led="wl-330n:blue:power"
 		;;
-	wzr-agl300nh)
-		status_led="buffalo:green:router"
+	wl-330n3g)
+		status_led="wl-330n3g:blue:power"
 		;;
 	wl-351)
 		status_led="wl-351:amber:power"
 		;;
-	wr512-3gn)
-		status_led="wr512:green:wps"
-		;;
-	zbt-wr8305rt)
-		status_led="zbt-wr8305rt:sys"
+	wli-tx4-ag300n)
+		status_led="wli-tx4-ag300n:blue:power"
 		;;
-	whr-300hp2 | \
-	whr-600d | \
-	whr-1166d | \
-	wsr-600 | \
-	wsr-1166)
-		status_led="buffalo:orange:diag"
+	wmr-300)
+		status_led="wmr-300:green:status"
 		;;
 	wnce2001)
-		status_led="netgear:green:power"
+		status_led="wnce2001:green:power"
 		;;
-	wt3020)
-		status_led="nexx:blue:power"
+	wr512-3gn)
+		status_led="wr512-3gn:green:wps"
 		;;
-	mzk-w300nh2)
-		status_led="mzkw300nh2:green:power"
+	wsr-1166)
+		status_led="wsr-1166:orange:diag"
 		;;
-	ur-326n4g)
-		status_led="ur326:green:wps"
+	wsr-600)
+		status_led="wsr-600:orange:diag"
 		;;
-	ur-336un)
-		status_led="ur336:green:wps"
+	wt3020)
+		status_led="wt3020:blue:power"
+		;;
+	wzr-agl300nh)
+		status_led="wzr-agl300nh:green:router"
 		;;
 	x5)
 		status_led="x5:green:power"
@@ -229,27 +303,17 @@ get_status_led() {
 	xdxrn502j)
 		status_led="xdxrn502j:green:power"
 		;;
-	miwifi-mini)
-		status_led="miwifi-mini:red:status"
-		;;
-	f7c027)
-		status_led="belkin:orange:status"
+	y1)
+		status_led="y1:blue:power"
 		;;
-	oy-0001)
-		status_led="oy:green:wifi"
-		;;
-	na930)
-		status_led="na930:blue:power"
-		;;
-	y1 | \
 	y1s)
-		status_led="lenovo:blue:power"
+		status_led="y1s:blue:power"
 		;;
-	zte-q7)
-		status_led="zte:red:status"
+	zbt-wr8305rt)
+		status_led="zbt-wr8305rt:green:sys"
 		;;
-	mzk-dp150n)
-		status_led="mzkdp150n:green:power"
+	zte-q7)
+		status_led="zte-q7:red:status"
 		;;
 	esac
 }