#!/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"
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
-XDSL_CTRL=vdsl_cpe_control
+#
+# ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE))
+# ITU-T G.997.1 Amendment 2 (04/2013) - Section 2.1 - (Vectoring mode enable (VECTORMODE_ENABLE))
+#
# G.992.1 Annex A
# G.992.2 Annex A
-# G.992.3 Annex A
-# G.992.4 Annex A
-# G.992.5 Annex A
+# G.992.3 Annex A / L-US1 / L_US-2 / M
+# G.992.5 Annex A / M
# G.993.2 Annex A/B/C
-xtse_adsl_a="04 01 04 01 00 01 00 00"
+# G.993.5 Annex A/B/C
+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
-xtse_adsl_b="10 00 10 00 00 04 00 00"
+# G.993.5 Annex A/B/C
+xtse_xdsl_b="10_00_10_00_00_04_00_07"
# G.992.1 Annex B
# G.992.3 Annex B
# G.992.5 Annex B
# G.992.5 Annex J
# G.993.2 Annex A/B/C
-xtse_adsl_j="10 00 10 40 00 04 01 00"
+# G.993.5 Annex A/B/C
+xtse_xdsl_j="10_00_10_40_00_04_01_07"
-xtse_vdsl="00 00 00 00 00 00 00 07"
+# G.992.1 Annex B
+xtse_xdsl_bdmt="10_00_00_00_00_00_00_00"
-xdsl_scr() {
- val=`echo $2 | sed "s/ / 0x/g"`
- echo "[WaitForConfiguration]={
-#G997XTUSEC_g997xtusecs 0x$val
-}
+# G.992.3 Annex B
+xtse_xdsl_b2="00_00_10_00_00_00_00_00"
-[WaitForLinkActivate]={
-}
+# G.992.5 Annex B
+xtse_xdsl_b2p="00_00_00_00_00_04_00_00"
-[WaitForRestart]={
-}
+# ANSI T1.413
+xtse_xdsl_at1="01_00_00_00_00_00_00_00"
-[Common]={
-}" > /tmp/$1.scr
-}
+# G.992.2 Annex A
+xtse_xdsl_alite="00_01_00_00_00_00_00_00"
+
+# G.992.1 Annex A
+xtse_xdsl_admt="04_00_00_00_00_00_00_00"
+
+# G.992.3 Annex A
+xtse_xdsl_a2="00_00_04_00_00_00_00_00"
+
+# G.992.5 Annex A
+xtse_xdsl_a2p="00_00_00_00_00_01_00_00"
+
+# G.992.3 Annex L
+xtse_xdsl_l="00_00_00_00_0C_00_00_00"
+
+# G.992.3 Annex M
+# G.992.5 Annex M
+xtse_xdsl_m="00_00_00_00_40_00_04_00"
+
+# G.992.3 Annex M
+xtse_xdsl_m2="00_00_00_00_40_00_00_00"
+
+# G.992.5 Annex M
+xtse_xdsl_m2p="00_00_00_00_00_00_04_00"
+
+#
+# ITU-T G.994.1 (06/2012) - Table 2 (Mandatory carrier sets)
+#
# A43
-tone_adsl_a="0x142"
-tone_vdsl_a="0x142"
+tone_adsl_a="0x142" # A43C + J43 + A43
+tone_vdsl_a="0x142" # A43C + J43 + A43
# A43 + V43
-tone_adsl_av="0x142"
-tone_vdsl_av="0x146"
+tone_adsl_av="0x142" # A43C + J43 + A43
+tone_vdsl_av="0x146" # A43C + J43 + A43 + V43
# B43
-tone_adsl_b="0x1"
-tone_vdsl_b="0x1"
+tone_adsl_b="0x81" # B43 + B43c
+tone_vdsl_b="0x1" # B43
# B43 + V43
-tone_adsl_bv="0x1"
-tone_vdsl_bv="0x5"
+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
0" > /tmp/lowlevel.cfg
}
-start() {
+service_triggers() {
+ procd_add_reload_trigger network
+}
+
+start_service() {
local annex
local firmware
local tone
local tone_adsl
local tone_vdsl
local xtse
- local xtse_adsl
+ 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
- [ -z "${xfer_mode}" ] && xfer_mode=ptm
+ eval "xtse=\"\${xtse_xdsl_$annex}\""
case "${xfer_mode}" in
atm)
- insmod ltq_atm_vr9
- mode=1
+ tc_layer="-T1:0x1:0x1_1:0x1:0x1"
+ ;;
+ ptm)
+ tc_layer="-T2:0x1:0x1_2:0x1:0x1"
;;
- *)
- insmod ltq_ptm_vr9
- mode=2
+ esac
+
+ case "${line_mode}" in
+ adsl)
+ mode="-M1"
+
+ # mask out VDSL bits when ADSL is requested
+ xtse="${xtse%_*}_00"
+ ;;
+ vdsl)
+ mode="-M2"
+
+ # mask out ADSL bits when VDSL is requested
+ xtse="00_00_00_00_00_00_00_${xtse##*_}"
;;
esac
- eval "xtse_adsl=\"\${xtse_adsl_$annex}\""
- if [ "${xtse_adsl}" ]; then
- xtse=$xtse_adsl
- else
- xtse_adsl=$xtse_adsl_a
- xtse=$xtse_vdsl
+ 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
- eval "tone_adsl=\"\${tone_adsl_$tone}\""
- [ -z "${tone_adsl}" ] && tone_adsl=$tone_adsl_av
+ if [ -z "${firmware}" ]; then
+ # search for the firmware provided by dsl-vrx200-firmware-xdsl-*
+ if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
+ case "${annex}" in
+ a*|l*|m*)
+ if [ -f "/lib/firmware/lantiq-vrx200-a.bin" ]; then
+ firmware="/lib/firmware/lantiq-vrx200-a.bin"
+ elif [ -f "/tmp/lantiq-vrx200-a.bin" ]; then
+ firmware="/tmp/lantiq-vrx200-a.bin"
+ elif [ -f "/lib/firmware/lantiq-vrx200-b.bin" ] && [ -f "/lib/firmware/lantiq-vrx200-b-to-a.bspatch" ]; then
+ bspatch /lib/firmware/lantiq-vrx200-b.bin \
+ /tmp/lantiq-vrx200-a.bin \
+ /lib/firmware/lantiq-vrx200-b-to-a.bspatch
+ firmware="/tmp/lantiq-vrx200-a.bin"
+ else
+ echo "firmware for annex a not found"
+ return 1
+ fi
+ ;;
+ b*|j*)
+ if [ -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"
+ elif [ -f "/lib/firmware/lantiq-vrx200-a.bin" ] && [ -f "/lib/firmware/lantiq-vrx200-a-to-b.bspatch" ]; then
+ bspatch /lib/firmware/lantiq-vrx200-a.bin \
+ /tmp/lantiq-vrx200-b.bin \
+ /lib/firmware/lantiq-vrx200-a-to-b.bspatch
+ firmware="/tmp/lantiq-vrx200-b.bin"
+ else
+ echo "firmware for annex b not found"
+ return 1
+ fi
+ ;;
+ *)
+ echo "annex type not supported use a or b"
+ return 1
+ ;;
+ esac
+ fi
+ fi
- eval "tone_vdsl=\"\${tone_vdsl_$tone}\""
- [ -z "${tone_vdsl}" ] && tone_vdsl=$tone_vdsl_av
-
[ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin
[ -f "${firmware}" ] || {
echo failed to find $firmware
return 1
}
- xdsl_scr adsl "${xtse_adsl}"
- xdsl_scr vdsl "${xtse_vdsl}"
- lowlevel_cfg "${tone_adsl}" "${tone_vdsl}"
+ eval "tone_adsl=\"\${tone_adsl_$tone}\""
+ eval "tone_vdsl=\"\${tone_vdsl_$tone}\""
+ [ -n "${tone_adsl}" ] && [ -n "${tone_vdsl}" ] && {
+ lowlevel_cfg "${tone_adsl}" "${tone_vdsl}"
+ lowlevel="-l /tmp/lowlevel.cfg"
+ }
- service_start /sbin/vdsl_cpe_control \
- -i `echo $xtse | sed "s/ /_/g"` \
+ [ -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 \
+ -i$xtse \
-n /sbin/dsl_notify.sh \
-f ${firmware} \
- -a /tmp/adsl.scr \
- -A /tmp/vdsl.scr \
- -l /tmp/lowlevel.cfg \
- -M ${mode}
+ $lowlevel \
+ ${mode} \
+ ${tc_layer} \
+ $autoboot
+ procd_close_instance
}
-stop() {
+stop_service() {
+ # do not use dsl_cmd to not block when this is locked up by some other proess
+ echo quit > /tmp/pipe/dsl_cpe0_cmd
DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
DSL_INTERFACE_STATUS="DOWN" \
/sbin/dsl_notify.sh
-
- service_stop /sbin/vdsl_cpe_control
}
projects / openwrt / openwrt.git / blobdiff