X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/78c205401ed5d3a55f0b5a92c098af8bf7145540..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/comgt/files/3g.sh?ds=sidebyside diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh index 125bec3d6..616beec4c 100644 --- a/package/comgt/files/3g.sh +++ b/package/comgt/files/3g.sh @@ -1,19 +1,20 @@ set_3g_led() { - grep WRT54G3G /proc/diag/model >/dev/null || return 0 + # set on WRT54G3G only + [ -f /proc/diag/model ] || return 0 + grep -q "WRT54G3G" /proc/diag/model >/dev/null || return 0 echo "$1" > /proc/diag/led/3g_green echo "$2" > /proc/diag/led/3g_blue + grep -q "WRT54G3G$" /proc/diag/model >/dev/null || return 0 echo "$3" > /proc/diag/led/3g_blink } scan_3g() { local device - - scan_ppp "$@" config_get device "$1" device # try to figure out the device if it's invalid [ -n "$device" -a -e "$device" ] || { - for device in /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 @@ -22,6 +23,7 @@ scan_3g() { } # enable 3G with the 3G button by default + local button config_get button "$1" button [ -z "$button" ] && { config_set "$1" button 1 @@ -29,6 +31,7 @@ scan_3g() { } stop_interface_3g() { + stop_interface_ppp "$1" set_3g_led 0 0 0 killall gcom >/dev/null 2>/dev/null } @@ -36,45 +39,73 @@ stop_interface_3g() { setup_interface_3g() { local iface="$1" local config="$2" - + local chat="/etc/chatscripts/3g.chat" + + local device config_get device "$config" device + local maxwait + 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 + local apn + config_get apn "$config" apn + + local service + config_get service "$config" service + + local pincode + config_get pincode "$config" pincode + + local mtu + config_get mtu "$config" mtu set_3g_led 1 0 1 # figure out hardware specific commands for the card - if gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | grep Novatel 2>/dev/null >/dev/null; then - case "$service" in - umts_only) CODE=2;; - gprs_only) CODE=1;; - *) CODE=0;; - esac - mode="AT\$NWRAT=${CODE},2" - else - case "$service" in - umts_only) CODE=1;; - gprs_only) CODE=0;; - *) CODE=3;; - esac - mode="AT_OPSYS=${CODE}" - fi - - PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { - echo "$cfg(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 + case "$service" in + cdma|evdo) chat="/etc/chatscripts/evdo.chat";; + *) + 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" + elif echo "$cardinfo" | grep Option; then + case "$service" in + umts_only) CODE=1;; + gprs_only) CODE=0;; + *) CODE=3;; + esac + mode="AT_OPSYS=${CODE}" + fi + # Don't assume Option to be default as it breaks with Huawei Cards/Sticks + + test -z "$pincode" || { + PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { + echo "$config(3g): Failed to set the PIN code." + set_3g_led 0 0 0 + return 1 + } + } + 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 -v -E -f $chat" start_pppd "$config" \ noaccomp \ nopcomp \ @@ -83,7 +114,6 @@ setup_interface_3g() { noauth \ lock \ crtscts \ - connect "USE_APN=\"$apn\" /etc/ppp/3g.connect" \ ${mtu:+mtu $mtu mru $mtu} \ - 460800 "$device" + 115200 "$device" }