diff options
| author | Dan Williams <dcbw@redhat.com> | 2012-11-28 10:15:45 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-12-05 10:49:21 -0600 |
| commit | 8fdcfd5b97e9a2a9e6fd98a9d833691256443498 (patch) | |
| tree | 420befd0af8034218243080c2074cd29db0bb142 | |
| parent | 56e5ecdc1b64c37f103eea1adc8ace3c743ed0e2 (diff) | |
huawei: consolidate MODE parsing
Both CDMA and 3GPP modems emit this, but using slightly different
formats.
| -rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 54 |
1 files changed, 49 insertions, 5 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 5cb5274b..82652617 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -786,2 +786,3 @@ huawei_mode_changed (MMAtSerialPort *port, gint a; + guint32 mask = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; @@ -791,4 +792,6 @@ huawei_mode_changed (MMAtSerialPort *port, + /* CDMA/EVDO devices may not send this */ str = g_match_info_fetch (match_info, 2); - act = huawei_sysinfo_submode_to_act (atoi (str)); + if (str[0]) + act = huawei_sysinfo_submode_to_act (atoi (str)); g_free (str); @@ -806,2 +809,3 @@ huawei_mode_changed (MMAtSerialPort *port, } + mask = MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK; break; @@ -818,2 +822,32 @@ huawei_mode_changed (MMAtSerialPort *port, } + mask = MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK; + break; + + case 2: + /* CDMA mode */ + if (act != MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN && + act != MM_MODEM_ACCESS_TECHNOLOGY_1XRTT) { + str = mm_modem_access_technology_build_string_from_mask (act); + mm_warn ("Unexpected access technology (%s) in CDMA mode", str); + g_free (str); + act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; + } + if (act == MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN) + act = MM_MODEM_ACCESS_TECHNOLOGY_1XRTT; + mask = MM_IFACE_MODEM_CDMA_ALL_ACCESS_TECHNOLOGIES_MASK; + break; + + case 4: /* HDR mode */ + case 8: /* CDMA/HDR hybrid mode */ + if (act != MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN && + (act < MM_MODEM_ACCESS_TECHNOLOGY_EVDO0 || + act > MM_MODEM_ACCESS_TECHNOLOGY_EVDOB)) { + str = mm_modem_access_technology_build_string_from_mask (act); + mm_warn ("Unexpected access technology (%s) in EVDO mode", str); + g_free (str); + act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; + } + if (act == MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN) + act = MM_MODEM_ACCESS_TECHNOLOGY_EVDO0; + mask = MM_IFACE_MODEM_CDMA_ALL_ACCESS_TECHNOLOGIES_MASK; break; @@ -833,5 +867,3 @@ huawei_mode_changed (MMAtSerialPort *port, - mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), - act, - MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK); + mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), act, mask); } @@ -1246,2 +1278,9 @@ set_cdma_unsolicited_events_handlers (MMBroadbandModemHuawei *self, NULL); + /* Access technology related */ + mm_at_serial_port_add_unsolicited_msg_handler ( + ports[i], + self->priv->mode_regex, + enable ? (MMAtSerialUnsolicitedMsgFn)huawei_mode_changed : NULL, + enable ? self : NULL, + NULL); } @@ -1652,4 +1691,9 @@ mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self) G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); - self->priv->mode_regex = g_regex_new ("\\r\\n\\^MODE:(\\d),(\\d)\\r\\n", + + /* 3GPP: <cr><lf>^MODE:5<cr><lf> + * CDMA: <cr><lf>^MODE: 2<cr><cr><lf> + */ + self->priv->mode_regex = g_regex_new ("\\r\\n\\^MODE:\\s*(\\d*),?(\\d*)\\r+\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); + self->priv->dsflowrpt_regex = g_regex_new ("\\r\\n\\^DSFLOWRPT:(.+)\\r\\n", |