X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0bf84185a31085ee12512035da0a86536b7f9b1b..6a26e8186b1cc0e6e650f762a08475d944b1288d:/package/comgt/files/3g.sh?ds=inline diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh index 2859a1bda..8fcac0936 100644 --- a/package/comgt/files/3g.sh +++ b/package/comgt/files/3g.sh @@ -1,4 +1,6 @@ set_3g_led() { + # set on WRT54G3G only + [ -d /proc/diag ] || return 0 grep WRT54G3G /proc/diag/model >/dev/null || return 0 echo "$1" > /proc/diag/led/3g_green echo "$2" > /proc/diag/led/3g_blue @@ -13,7 +15,7 @@ scan_3g() { # try to figure out the device if it's invalid [ -n "$device" -a -e "$device" ] || { - for device in /dev/ttyUSB2 /dev/tts/2 /dev/usb/tts/0 /dev/noz0; do + for device in /dev/ttyUSB0 /dev/ttyUSB1 /dev/ttyUSB2 /dev/tts/2 /dev/usb/tts/0 /dev/noz0; do [ -e "$device" ] && { config_set "$1" device "$device" break @@ -39,15 +41,21 @@ setup_interface_3g() { local chat="/etc/chatscripts/3g.chat" config_get device "$config" device + config_get maxwait "$config" maxwait + maxwait=${maxwait:-20} + while [ ! -e "$device" -a $maxwait -gt 0 ];do # wait for driver loading to catch up + maxwait=$(($maxwait - 1)) + sleep 1 + done for module in slhc ppp_generic ppp_async; do /sbin/insmod $module 2>&- >&- done - config_get apn "$cfg" apn - config_get service "$cfg" service - config_get pincode "$cfg" pincode - config_get mtu "$cfg" mtu + config_get apn "$config" apn + config_get service "$config" service + config_get pincode "$config" pincode + config_get mtu "$config" mtu set_3g_led 1 0 1 @@ -55,14 +63,15 @@ setup_interface_3g() { case "$service" in cdma|evdo) chat="/etc/chatscripts/evdo.chat";; *) - if gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | grep Novatel 2>/dev/null >/dev/null; then + cardinfo=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom) + if echo "$cardinfo" | grep Novatel; then case "$service" in umts_only) CODE=2;; gprs_only) CODE=1;; *) CODE=0;; esac mode="AT\$NWRAT=${CODE},2" - else + elif echo "$cardinfo" | grep Option; then case "$service" in umts_only) CODE=1;; gprs_only) CODE=0;; @@ -70,17 +79,20 @@ setup_interface_3g() { esac mode="AT_OPSYS=${CODE}" fi + # Don't assume Option to be default as it breaks with Huawei Cards/Sticks PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { - echo "$cfg(3g): Failed to set the PIN code." + echo "$config(3g): Failed to set the PIN code." set_3g_led 0 0 0 return 1 } - MODE="$mode" gcom -d "$device" -s /etc/gcom/setmode.gcom + test -z "$mode" || { + MODE="$mode" gcom -d "$device" -s /etc/gcom/setmode.gcom + } esac set_3g_led 1 0 0 - config_set "$config" "connect" "${apn:+USE_APN=$apn }/usr/sbin/chat -t5 -f $chat" + config_set "$config" "connect" "${apn:+USE_APN=$apn }/usr/sbin/chat -t5 -v -E -f $chat" start_pppd "$config" \ noaccomp \ nopcomp \