Browse Source

unbreak dsl firmware loading

Signed-off-by: Andrej Vlašić <[email protected]>

SVN-Revision: 31066
John Crispin 14 years ago
parent
commit
f3cb8728d4
1 changed files with 8 additions and 2 deletions
  1. 8 2
      package/ltq-dsl-app/files/dsl_control

+ 8 - 2
package/ltq-dsl-app/files/dsl_control

@@ -278,9 +278,11 @@ annex_m2p=00_00_00_00_00_00_04_00
 #
 start() {
 	local annex
+	local fwannex
 	local xtu
 	config_load network
-	config_get annex atm annex
+	config_get annex adsl annex
+	config_get fwannex adsl fwannex
 
 	# get xtu
 	eval "xtu=\"\${annex_$annex}\""
@@ -289,10 +291,14 @@ start() {
 	[ -n "${annex}" -a -z "${xtu}" ] &&
 		echo "unknown annex mode $annex"
 
+	# check for invalid fw annex mode
+	[[ "$fwannex" != "a" && "$fwannex" != "b" ]] &&
+		echo "invalid fwannex: $fwannex"
+
 	# start CPE dsl daemon in the background
 	service_start /sbin/dsl_cpe_control -i${xtu} \
 			-n /sbin/dsl_notify.sh \
-			-f /lib/firmware/ModemHWE.bin
+			-f /lib/firmware/dsl-fw-${fwannex}.bin
 }
 
 #