#!/bin/ash
-CFG=/etc/board.json
-
. /lib/functions.sh
. /usr/share/libubox/jshn.sh
json_select_object "$name"
json_add_string ifname "$iface"
- if ! json_is_a protocol string; then
+ if ! json_is_a protocol string || [ -n "$proto" ]; then
case "$proto" in
static|dhcp|none|pppoe) : ;;
*)
json_select ..
}
+ucidef_set_interface_raw() {
+ json_select_object network
+ _ucidef_set_interface "$@"
+ json_select ..
+}
+
_ucidef_add_switch_port() {
- # inherited: $num $device $need_tag $role $index $prev_role
+ # inherited: $num $device $need_tag $want_untag $role $index $prev_role
# inherited: $n_cpu $n_ports $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5
n_ports=$((n_ports + 1))
json_select_array ports
json_add_object
json_add_int num "$num"
- [ -n "$device" ] && json_add_string device "$device"
- [ -n "$need_tag" ] && json_add_boolean need_tag "$need_tag"
- [ -n "$role" ] && json_add_string role "$role"
- [ -n "$index" ] && json_add_int index "$index"
+ [ -n "$device" ] && json_add_string device "$device"
+ [ -n "$need_tag" ] && json_add_boolean need_tag "$need_tag"
+ [ -n "$want_untag" ] && json_add_boolean want_untag "$want_untag"
+ [ -n "$role" ] && json_add_string role "$role"
+ [ -n "$index" ] && json_add_int index "$index"
json_close_object
json_select ..
_ucidef_finish_switch_roles() {
# inherited: $name $n_cpu $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5
- local index role roles num device need_tag port ports
+ local index role roles num device need_tag want_untag port ports
json_select switch
json_select "$name"
json_select "$name"
json_select ports
json_select "$port"
- json_get_vars num device need_tag
+ json_get_vars num device need_tag want_untag
json_select ..
json_select ..
- if [ $n_vlan -gt $n_cpu -o ${need_tag:-0} -eq 1 ]; then
+ if [ ${need_tag:-0} -eq 1 -o ${want_untag:-0} -ne 1 ]; then
num="${num}t"
device="${device}.${index}"
fi
num="${port%%@*}"
device="${port##*@}"
need_tag=0
+ want_untag=0
[ "${num%t}" != "$num" ] && {
num="${num%t}"
need_tag=1
}
+ [ "${num%u}" != "$num" ] && {
+ num="${num%u}"
+ want_untag=1
+ }
;;
[0-9]*:*:[0-9]*)
num="${port%%:*}"
_ucidef_add_switch_port
fi
- unset num device role index need_tag
+ unset num device role index need_tag want_untag
done
json_select ..
json_select ..
ucidef_add_vdsl_modem() {
local annex="$1"
- local firmware="$2"
- local tone="$3"
- local xfer_mode="$4"
+ local tone="$2"
+ local xfer_mode="$3"
json_select_object dsl
json_select_object modem
json_add_string type "vdsl"
json_add_string annex "$annex"
- json_add_string firmware "$firmware"
json_add_string tone "$tone"
json_add_string xfer_mode "$xfer_mode"
json_select ..
json_select ..
}
-ucidef_set_led_netdev() {
+ucidef_set_led_ataport() {
+ _ucidef_set_led_trigger "$1" "$2" "$3" ata"$4"
+}
+
+_ucidef_set_led_common() {
local cfg="led_$1"
local name="$2"
local sysfs="$3"
- local dev="$4"
json_select_object led
json_select_object "$1"
json_add_string name "$name"
- json_add_string type netdev
json_add_string sysfs "$sysfs"
- json_add_string device "$dev"
- json_select ..
-
- json_select ..
}
-ucidef_set_led_usbdev() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local dev="$4"
+ucidef_set_led_default() {
+ local default="$4"
- json_select_object led
+ _ucidef_set_led_common "$1" "$2" "$3"
- json_select_object "$1"
- json_add_string name "$name"
- json_add_string type usb
- json_add_string sysfs "$sysfs"
- json_add_string device "$dev"
+ json_add_string default "$default"
json_select ..
json_select ..
}
-ucidef_set_led_wlan() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local trigger="$4"
+ucidef_set_led_gpio() {
+ local gpio="$4"
+ local inverted="$5"
- json_select_object led
+ _ucidef_set_led_common "$1" "$2" "$3"
- json_select_object "$1"
- json_add_string name "$name"
- json_add_string type trigger
- json_add_string sysfs "$sysfs"
json_add_string trigger "$trigger"
+ json_add_string type gpio
+ json_add_int gpio "$gpio"
+ json_add_boolean inverted "$inverted"
json_select ..
json_select ..
}
-ucidef_set_led_switch() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local trigger="$4"
- local port_mask="$5"
+ucidef_set_led_ide() {
+ _ucidef_set_led_trigger "$1" "$2" "$3" ide-disk
+}
- json_select_object led
+ucidef_set_led_netdev() {
+ local dev="$4"
+ local mode="${5:-link tx rx}"
- json_select_object "$1"
- json_add_string name "$name"
- json_add_string type switch
- json_add_string sysfs "$sysfs"
- json_add_string trigger "$trigger"
- json_add_string port_mask "$port_mask"
+ _ucidef_set_led_common "$1" "$2" "$3"
+
+ json_add_string type netdev
+ json_add_string device "$dev"
+ json_add_string mode "$mode"
json_select ..
json_select ..
}
-ucidef_set_led_default() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local default="$4"
+ucidef_set_led_oneshot() {
+ _ucidef_set_led_timer $1 $2 $3 "oneshot" $4 $5
+}
- json_select_object led
+ucidef_set_led_portstate() {
+ local port_state="$4"
- json_select_object "$1"
- json_add_string name "$name"
- json_add_string sysfs "$sysfs"
- json_add_string default "$default"
+ _ucidef_set_led_common "$1" "$2" "$3"
+
+ json_add_string trigger port_state
+ json_add_string type portstate
+ json_add_string port_state "$port_state"
json_select ..
json_select ..
}
-ucidef_set_led_gpio() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local gpio="$4"
- local inverted="$5"
+ucidef_set_led_rssi() {
+ local iface="$4"
+ local minq="$5"
+ local maxq="$6"
+ local offset="${7:-0}"
+ local factor="${8:-1}"
- json_select_object led
+ _ucidef_set_led_common "$1" "$2" "$3"
- json_select_object "$1"
- json_add_string type gpio
+ json_add_string type rssi
json_add_string name "$name"
- json_add_string sysfs "$sysfs"
- json_add_string trigger "$trigger"
- json_add_int gpio "$gpio"
- json_add_boolean inverted "$inverted"
+ json_add_string iface "$iface"
+ json_add_string minq "$minq"
+ json_add_string maxq "$maxq"
+ json_add_string offset "$offset"
+ json_add_string factor "$factor"
json_select ..
json_select ..
}
-ucidef_set_led_ide() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
+ucidef_set_led_switch() {
+ local trigger_name="$4"
+ local port_mask="$5"
+ local speed_mask="$6"
- json_select_object led
+ _ucidef_set_led_common "$1" "$2" "$3"
- json_select_object "$1"
- json_add_string name "$name"
- json_add_string sysfs "$sysfs"
- json_add_string trigger ide-disk
+ json_add_string trigger "$trigger_name"
+ json_add_string type switch
+ json_add_string port_mask "$port_mask"
+ json_add_string speed_mask "$speed_mask"
json_select ..
json_select ..
}
-__ucidef_set_led_timer() {
- local cfg="led_$1"
- local name="$2"
- local sysfs="$3"
- local trigger="$4"
+_ucidef_set_led_timer() {
+ local trigger_name="$4"
local delayon="$5"
local delayoff="$6"
- json_select_object led
+ _ucidef_set_led_common "$1" "$2" "$3"
- json_select_object "$1"
- json_add_string type "$trigger"
- json_add_string name "$name"
- json_add_string sysfs "$sysfs"
+ json_add_string trigger "$trigger_name"
json_add_int delayon "$delayon"
json_add_int delayoff "$delayoff"
json_select ..
json_select ..
}
-ucidef_set_led_oneshot() {
- __ucidef_set_led_timer $1 $2 $3 "oneshot" $4 $5
+ucidef_set_led_timer() {
+ _ucidef_set_led_timer $1 $2 $3 "timer" $4 $5
}
-ucidef_set_led_timer() {
- __ucidef_set_led_timer $1 $2 $3 "timer" $4 $5
+_ucidef_set_led_trigger() {
+ local trigger_name="$4"
+
+ _ucidef_set_led_common "$1" "$2" "$3"
+
+ json_add_string trigger "$trigger_name"
+ json_select ..
+
+ json_select ..
}
-ucidef_set_led_rssi() {
- local cfg="led_$1"
+ucidef_set_led_usbdev() {
+ local dev="$4"
+
+ _ucidef_set_led_common "$1" "$2" "$3"
+
+ json_add_string type usb
+ json_add_string device "$dev"
+ json_select ..
+
+ json_select ..
+}
+
+ucidef_set_led_usbhost() {
+ _ucidef_set_led_trigger "$1" "$2" "$3" usb-host
+}
+
+ucidef_set_led_usbport() {
+ local obj="$1"
local name="$2"
local sysfs="$3"
- local iface="$4"
- local minq="$5"
- local maxq="$6"
- local offset="$7"
- local factor="$8"
+ shift
+ shift
+ shift
- json_select_object led
+ _ucidef_set_led_common "$obj" "$name" "$sysfs"
- json_select_object "$1"
- json_add_string type rssi
- json_add_string name "$name"
- json_add_string iface "$iface"
- json_add_string sysfs "$sysfs"
- json_add_string minq "$minq"
- json_add_string maxq "$maxq"
- json_add_string offset "$offset"
- json_add_string factor "$factor"
+ json_add_string type usbport
+ json_select_array ports
+ for port in "$@"; do
+ json_add_string port "$port"
+ done
+ json_select ..
json_select ..
json_select ..
}
+ucidef_set_led_wlan() {
+ _ucidef_set_led_trigger "$1" "$2" "$3" "$4"
+}
+
ucidef_set_rssimon() {
local dev="$1"
local refresh="$2"
json_select ..
json_select ..
-
}
ucidef_add_gpio_switch() {
json_select ..
}
+ucidef_set_hostname() {
+ local hostname="$1"
+
+ json_select_object system
+ json_add_string hostname "$hostname"
+ json_select ..
+}
+
+ucidef_set_ntpserver() {
+ local server
+
+ json_select_object system
+ json_select_array ntpserver
+ for server in "$@"; do
+ json_add_string "" "$server"
+ done
+ json_select ..
+ json_select ..
+}
+
board_config_update() {
json_init
[ -f ${CFG} ] && json_load "$(cat ${CFG})"
projects / openwrt / openwrt.git / blobdiff