From ce45d49f3c7d6558b634bbb978e9eb123f08010f Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Tue, 14 Feb 2012 15:05:49 +0000
Subject: [ltq-dsl] add annex selection support to ltq_dsl package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30518 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ltq-dsl-app/files/dsl_control | 32 +++++++++++++++++++++++++++++++-
 package/ltq-dsl/Makefile              |  3 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/ltq-dsl-app/files/dsl_control b/package/ltq-dsl-app/files/dsl_control
index df31c39e5d..67e82b6d0a 100644
--- a/package/ltq-dsl-app/files/dsl_control
+++ b/package/ltq-dsl-app/files/dsl_control
@@ -2,6 +2,8 @@
 # Copyright (C) 2008 OpenWrt.org
 START=99
 
+. /lib/functions.sh
+
 EXTRA_COMMANDS="status lucistat"
 EXTRA_HELP="	status  Get DSL status information
 	lucistat  Get status information if lua friendly format"
@@ -255,12 +257,40 @@ lucistat() {
 	echo "return dsl"
 }
 
+
+annex_b=10_00_10_00_00_04_00_00
+annex_bdmt=10_00_00_00_00_00_00_00
+annex_b2=00_00_10_00_00_00_00_00
+annex_b2p=00_00_00_00_00_04_00_00
+annex_a=04_01_04_00_00_01_00_00
+annex_at1=01_00_00_00_00_00_00_00
+annex_alite=00_01_00_00_00_00_00_00
+annex_admt=04_00_00_00_00_00_00_00
+annex_a2=00_00_04_00_00_00_00_00
+annex_a2p=00_00_00_00_00_01_00_00
+annex_l=00_00_00_00_04_00_00_00
+annex_m=00_00_00_00_40_00_04_00
+annex_m2=00_00_00_00_40_00_00_00
+annex_m2p=00_00_00_00_00_00_04_00
+
 #
 # Simple start routine
 #
 start() {
+	local annex
+	local xtu
+	config_load network
+	config_get annex atm annex
+
+	# get xtu
+	eval "xtu=\"\${annex_$annex}\""
+
+	# check for invalid annex mode
+	[ -n "${annex}" -a -z "${xtu}" ] &&
+		echo "unknown annex mode $annex"
+
 	# start CPE dsl daemon in the background
-	service_start /sbin/dsl_cpe_control -i \
+	service_start /sbin/dsl_cpe_control -i${xtu} \
 			-n /sbin/dsl_notify.sh \
 			-f /lib/firmware/ModemHWE.bin
 }
diff --git a/package/ltq-dsl/Makefile b/package/ltq-dsl/Makefile
index 973967eb63..0e2a9328a8 100644
--- a/package/ltq-dsl/Makefile
+++ b/package/ltq-dsl/Makefile
@@ -160,7 +160,8 @@ endef
 
 define Package/kmod-ltq-dsl-firmware-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/lib/firmware/
-	$(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(BUILD_VARIANT).bin $(1)/lib/firmware/ModemHWE.bin
+	$(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(BUILD_VARIANT).bin $(1)/lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin
+	ln -s /lib/firmware/dsl-fw-$(word 1, $(subst -, ,$(BUILD_VARIANT))).bin $(1)/lib/firmware/ModemHWE.bin
 endef
 
 $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-danube))
-- 
cgit v1.2.3