minor cleanup for adsl firmware handling

SVN-Revision: 34818
This commit is contained in:
John Crispin 2012-12-21 13:47:25 +00:00
parent 346a8e5878
commit 9a134fb7c0

View File

@ -277,27 +277,23 @@ annex_m2p=00_00_00_00_00_00_04_00
# #
start() { start() {
local annex local annex
local fwannex local firmware
local xtu local xtu
config_load network config_load network
config_get annex adsl annex config_get annex wan annex
config_get fwannex adsl fwannex config_get firmware wan firmware
# get xtu # get xtu
eval "xtu=\"\${annex_$annex}\"" eval "xtu=\"\${annex_$annex}\""
# check for invalid annex mode # check for firmware
[ -n "${annex}" -a -z "${xtu}" ] && [ -z "${firmware}" ] &&
echo "unknown annex mode $annex" firmware=adsl.bin
# check for invalid fw annex mode
[[ "$fwannex" != "a" && "$fwannex" != "b" ]] &&
echo "invalid fwannex: $fwannex"
# start CPE dsl daemon in the background # start CPE dsl daemon in the background
service_start /sbin/dsl_cpe_control -i${xtu} \ service_start /sbin/dsl_cpe_control -i${xtu} \
-n /sbin/dsl_notify.sh \ -n /sbin/dsl_notify.sh \
-f /lib/firmware/ModemHWE.bin -f /lib/firmware/${firmware}
} }
# #
@ -308,7 +304,7 @@ start() {
stop() { stop() {
DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
DSL_INTERFACE_STATUS="DOWN" \ DSL_INTERFACE_STATUS="DOWN" \
/sbin/dsl_notify.sh /sbin/dsl_notify.sh
service_stop /sbin/dsl_cpe_control service_stop /sbin/dsl_cpe_control
} }