ltq-*dsl-app: dsl_control: remove unneeded check for lantiq_dsl.sh

[openwrt/staging/hauke.git] / package / network / config / ltq-vdsl-app / files / dsl_control

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index 48c0cbeac269bd720e5383c98d9df5c1e0d1058e..9c5df4cccd821626c3e8c215da43c37908294a30 100644 (file)
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -1,15 +1,14 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2012 OpenWrt.org
 
-# needs to start before the atm layer which starts at 50
-START=48
+START=97
 USE_PROCD=1
 
-EXTRA_COMMANDS="status lucistat"
-EXTRA_HELP="   status  Get DSL status information
-       lucistat  Get status information if lua friendly format"
+EXTRA_COMMANDS="dslstat lucistat"
+EXTRA_HELP="   dslstat Get DSL status information
+       lucistat Get status information in lua friendly format"
 
-[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+. /lib/functions/lantiq_dsl.sh
 
 #
 # ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE))
@@ -21,14 +20,14 @@ EXTRA_HELP="        status  Get DSL status information
 # G.992.5 Annex A / M
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_a="05_01_04_00_4C_01_04_0F"
+xtse_xdsl_a="05_01_04_00_4C_01_04_07"
 
 # G.992.1 Annex B
 # G.992.3 Annex B
 # G.992.5 Annex B
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_b="10_00_10_00_00_04_00_0F"
+xtse_xdsl_b="10_00_10_00_00_04_00_07"
 
 # G.992.1 Annex B
 # G.992.3 Annex B
@@ -37,7 +36,7 @@ xtse_xdsl_b="10_00_10_00_00_04_00_0F"
 # G.992.5 Annex J
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_j="10_00_10_40_00_04_01_0F"
+xtse_xdsl_j="10_00_10_40_00_04_01_07"
 
 # G.992.1 Annex B
 xtse_xdsl_bdmt="10_00_00_00_00_00_00_00"
@@ -96,6 +95,22 @@ tone_vdsl_b="0x1" # B43
 tone_adsl_bv="0x81" # B43 + B43c
 tone_vdsl_bv="0x5" # B43 + V43
 
+# create ADSL autoboot script. Used for SNR margin tweak
+autoboot_script() {
+    echo "[WaitForConfiguration]={
+locs 0 $1
+}
+
+[WaitForLinkActivate]={
+}
+
+[WaitForRestart]={
+}
+
+[Common]={
+}" > /tmp/dsl.scr
+}
+
 lowlevel_cfg() {
        echo "# VRX Low Level Configuration File
 #
@@ -162,35 +177,61 @@ start_service() {
        local tone_adsl
        local tone_vdsl
        local xtse
+       local xfer_mode
+       local line_mode
+       local tc_layer
        local mode
        local lowlevel
+       local snr
 
        config_load network
        config_get tone dsl tone
        config_get annex dsl annex
        config_get firmware dsl firmware
        config_get xfer_mode dsl xfer_mode
+       config_get line_mode dsl line_mode
+       config_get snr dsl ds_snr_offset
 
        eval "xtse=\"\${xtse_xdsl_$annex}\""
 
-       [ -z "${xfer_mode}" ] && xfer_mode=ptm
-
        case "${xfer_mode}" in
        atm)
-               LOAD=ltq_atm_vr9
-               UNLOAD=ltq_ptm_vr9
-               mode=1
+               tc_layer="-T1:0x1:0x1_1:0x1:0x1"
+               ;;
+       ptm)
+               tc_layer="-T2:0x1:0x1_2:0x1:0x1"
+               ;;
+       esac
+
+       case "${line_mode}" in
+       adsl)
+               mode="-M1"
 
-               # mask out VDSL bits when ATM is requested
+               # mask out VDSL bits when ADSL is requested
                xtse="${xtse%_*}_00"
                ;;
-       *)
-               LOAD=ltq_ptm_vr9
-               UNLOAD=ltq_atm_vr9
-               mode=2
+       vdsl)
+               mode="-M2"
+
+               # mask out ADSL bits when VDSL is requested
+               xtse="00_00_00_00_00_00_00_${xtse##*_}"
                ;;
        esac
 
+       local annexgpio="/sys/class/gpio/annex"
+       if [ -d "${annexgpio}a" ] && [ -d "${annexgpio}b" ]; then
+               case "${annex}" in
+                       a*|l*|m*)
+                               echo 1 > "${annexgpio}a/value"
+                               echo 0 > "${annexgpio}b/value"
+                               ;;
+                       b*|j*)
+                               echo 0 > "${annexgpio}a/value"
+                               echo 1 > "${annexgpio}b/value"
+                               ;;
+               esac
+       fi
+
        if [ -z "${firmware}" ]; then
                # search for the firmware provided by dsl-vrx200-firmware-xdsl-*
                if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
@@ -211,7 +252,9 @@ start_service() {
                                fi
                                ;;
                        b*|j*)
-                               if [ -f "/lib/firmware/lantiq-vrx200-b.bin" ]; then
+                               if [ -f "/lib/firmware/vr9_dsl_fw_annex_b.bin" ]; then
+                                       firmware="/lib/firmware/vr9_dsl_fw_annex_b.bin"
+                               elif [ -f "/lib/firmware/lantiq-vrx200-b.bin" ]; then
                                        firmware="/lib/firmware/lantiq-vrx200-b.bin"
                                elif [ -f "/tmp/lantiq-vrx200-b.bin" ]; then
                                        firmware="/tmp/lantiq-vrx200-b.bin"
@@ -246,14 +289,21 @@ start_service() {
                lowlevel="-l /tmp/lowlevel.cfg"
        }
 
+       [ -z "${snr}" ] || {
+           # for SNR offset setting
+           autoboot_script "$snr"
+           autoboot="-a /tmp/dsl.scr -A /tmp/dsl.scr"
+       }
+
        procd_open_instance
-       procd_set_param command /sbin/vdsl_cpe_control_wrapper \
+       procd_set_param command /sbin/vdsl_cpe_control \
                        -i$xtse \
                        -n /sbin/dsl_notify.sh \
                        -f ${firmware} \
                        $lowlevel \
-                       -M ${mode}
-       procd_append_param env "LOAD=$LOAD" "UNLOAD=$UNLOAD"
+                       ${mode} \
+                       ${tc_layer} \
+                       $autoboot
        procd_close_instance
 }