This removes unnecessary duplication and simplifies led setup for new
boards. It would be a one line change most likely.

Signed-off-by: Alexander Gordeev <lasa...@lvk.cs.msu.su>
---
 .../ramips/base-files/etc/uci-defaults/fonera20n   |   24 -------------
 .../ramips/base-files/etc/uci-defaults/hw550-3g    |   24 -------------
 .../linux/ramips/base-files/etc/uci-defaults/leds  |   36 ++++++++++++++++++++
 .../base-files/etc/uci-defaults/mofi3500-3gn       |   24 -------------
 .../linux/ramips/base-files/etc/uci-defaults/nw718 |   13 -------
 5 files changed, 36 insertions(+), 85 deletions(-)
 delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/fonera20n
 delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/hw550-3g
 create mode 100755 target/linux/ramips/base-files/etc/uci-defaults/leds
 delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/mofi3500-3gn

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/fonera20n 
b/target/linux/ramips/base-files/etc/uci-defaults/fonera20n
deleted file mode 100755
index 006f805..0000000
--- a/target/linux/ramips/base-files/etc/uci-defaults/fonera20n
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-fonera20n_set_leds() {
-       uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='fonera20n:amber:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-. /lib/ramips.sh
-
-board=$(ramips_board_name)
-
-if [ "${board}" == "fonera20n" ]; then
-       fonera20n_set_leds
-fi
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/hw550-3g 
b/target/linux/ramips/base-files/etc/uci-defaults/hw550-3g
deleted file mode 100755
index 49ad568..0000000
--- a/target/linux/ramips/base-files/etc/uci-defaults/hw550-3g
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-hw550_set_leds() {
-       uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='hw550-3g:green:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-. /lib/ramips.sh
-
-board=$(ramips_board_name)
-
-if [ "${board}" == "hw550-3g" ]; then
-       hw550_set_leds
-fi
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds 
b/target/linux/ramips/base-files/etc/uci-defaults/leds
new file mode 100755
index 0000000..e814d1e
--- /dev/null
+++ b/target/linux/ramips/base-files/etc/uci-defaults/leds
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. /lib/ramips.sh
+
+set_usb_led() {
+       local sysfs="$1"
+
+       uci batch <<EOF
+set system.usb_led=led
+set system.usb_led.name='usb'
+set system.usb_led.sysfs='$sysfs'
+set system.usb_led.trigger='usbdev'
+set system.usb_led.dev='1-1'
+set system.usb_led.interval='50'
+commit system
+EOF
+}
+
+board=$(ramips_board_name)
+
+case $board in
+       fonera20n)
+               set_usb_led "fonera20n:amber:usb"
+               ;;
+       hw550-3g)
+               set_usb_led "hw550-3g:green:usb"
+               ;;
+       mofi3500-3gn)
+               set_usb_led "mofi3500-3gn:green:usb"
+               ;;
+       nw718)
+               set_usb_led "nw718:amber:usb"
+               ;;
+       *)
+               echo "leds: no setup defined for this board"
+esac
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/mofi3500-3gn 
b/target/linux/ramips/base-files/etc/uci-defaults/mofi3500-3gn
deleted file mode 100755
index eba2b16..0000000
--- a/target/linux/ramips/base-files/etc/uci-defaults/mofi3500-3gn
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-mofi3500_set_leds() {
-       uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='mofi3500-3gn:green:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
-. /lib/ramips.sh
-
-board=$(ramips_board_name)
-
-if [ "${board}" == "mofi3500-3gn" ]; then
-       mofi3500_set_leds
-fi
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/nw718 
b/target/linux/ramips/base-files/etc/uci-defaults/nw718
index 590b659..6fd96df 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/nw718
+++ b/target/linux/ramips/base-files/etc/uci-defaults/nw718
@@ -27,23 +27,10 @@ commit network
 EOF
 }
 
-nw718_set_leds() {
-       uci batch <<EOF
-set system.usb_led=led
-set system.usb_led.name='USB'
-set system.usb_led.sysfs='nw718:amber:usb'
-set system.usb_led.trigger='usbdev'
-set system.usb_led.dev='1-1'
-set system.usb_led.interval='50'
-commit system
-EOF
-}
-
 . /lib/ramips.sh
 
 board=$(ramips_board_name)
 
 if [ "${board}" == "nw718" ]; then
-       nw718_set_leds
        nw718_set_macs
 fi
-- 
1.7.5.4

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to