lantiq: move the dsl-modem config to network.@dsl-modem[-1]

make sure uci_defaults generates a proper uci config for the v/adsl modem

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 40439

diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control
index d48f3f62667b54e48a64f7c74a2300376e7fc9ed..e48b72b059437d5e0f08406dc74c56d9fa541d74 100644 (file)
--- a/package/network/config/ltq-adsl-app/files/dsl_control
+++ b/package/network/config/ltq-adsl-app/files/dsl_control
@@ -32,8 +32,8 @@ start() {
        local firmware
        local xtu
        config_load network
-       config_get annex wan annex
-       config_get firmware wan firmware
+       config_get annex dsl annex
+       config_get firmware dsl firmware
 
        eval "xtu=\"\${annex_$annex}\""
 

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index 81db4d2641bc89b1e10b483477ac68163f096c6a..c6be2284941dfdb0aabd661b7fca806b8a769c72 100644 (file)
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -134,10 +134,10 @@ start() {
        local mode
 
        config_load network
-       config_get tone wan tone
-       config_get annex wan annex
-       config_get firmware wan firmware
-       config_get xfer_mode wan xfer_mode
+       config_get tone dsl tone
+       config_get annex dsl annex
+       config_get firmware dsl firmware
+       config_get xfer_mode dsl xfer_mode
 
        [ -z "${xfer_mode}" ] && xfer_mode=ptm
 

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 428089ceb716c46e91e0ffc9cfcbf373b42a45e3..ac06e5f27826814e5362da80ff09ac16800277e5 100644 (file)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -28,6 +28,30 @@ set network.wan6.proto='dhcpv6'
 EOF
 }
 
+set_adsl_modem() {
+       local annex=$1
+       local firmware=$2
+       uci batch <<EOF
+set network.adsl='dsl-modem'
+set network.adsl.annex='$annex'
+set network.adsl.firmware='$firmware'
+EOF
+}
+
+set_vdsl_modem() {
+       local annex=$1
+       local firmware=$2
+       local tone=$3
+       local xfer_mode=$4
+       uci batch <<EOF
+set network.vdsl='dsl-modem'
+set network.vdsl.annex='$annex'
+set network.vdsl.firmware='$firmware'
+set network.vdsl.tone='$tone'
+set network.vdsl.xfer_mode='$xfer_mode'
+EOF
+}
+
 . /lib/functions/uci-defaults.sh
 . /lib/functions/lantiq.sh
 
@@ -38,6 +62,7 @@ ucidef_set_interface_lan 'eth0'
 
 vpi=1
 vci=32
+annex="a"
 encaps="llc"
 payload="bridged"
 lan_mac=""
@@ -143,6 +168,13 @@ BTHOMEHUBV2B)
 esac
 
 [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
+
+if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then
+       set_vdsl_modem "$annex" "vdsl.bin" "bv" "ptm"
+else
+       set_adsl_modem "$annex" "adsl.bin"
+fi
+
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac