diff options
| author | Ben Chan <benchan@chromium.org> | 2012-10-15 23:48:18 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-16 09:40:59 +0200 |
| commit | e2f3034f6e2c79062c095be0bc4278907b32ec8f (patch) | |
| tree | dcaa7c7c1390834aa87f02b86405205e88d874dc | |
| parent | e39b3a42edae4806f195824ce01251d625df0028 (diff) | |
icera: improve parsing of access technologies in %NWSTATE response
| -rw-r--r-- | plugins/icera/mm-broadband-modem-icera.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c index db702527..44182a25 100644 --- a/plugins/icera/mm-broadband-modem-icera.c +++ b/plugins/icera/mm-broadband-modem-icera.c @@ -322,27 +322,27 @@ ipdpact_received (MMAtSerialPort *port, static MMModemAccessTechnology nwstate_to_act (const gchar *str) { + MMModemAccessTechnology technologies = 0; + /* small 'g' means CS, big 'G' means PS */ - if (!strcmp (str, "2g")) - return MM_MODEM_ACCESS_TECHNOLOGY_GSM; - else if (!strcmp (str, "2G-GPRS")) - return MM_MODEM_ACCESS_TECHNOLOGY_GPRS; - else if (!strcmp (str, "2G-EDGE")) - return MM_MODEM_ACCESS_TECHNOLOGY_EDGE; - else if (!strcmp (str, "3G")) - return MM_MODEM_ACCESS_TECHNOLOGY_UMTS; - else if (!strcmp (str, "3g")) - return MM_MODEM_ACCESS_TECHNOLOGY_UMTS; - else if (!strcmp (str, "R99")) - return MM_MODEM_ACCESS_TECHNOLOGY_UMTS; - else if (!strcmp (str, "3G-HSDPA") || !strcmp (str, "HSDPA")) - return MM_MODEM_ACCESS_TECHNOLOGY_HSDPA; - else if (!strcmp (str, "3G-HSUPA") || !strcmp (str, "HSUPA")) - return MM_MODEM_ACCESS_TECHNOLOGY_HSUPA; - else if (!strcmp (str, "3G-HSDPA-HSUPA") || !strcmp (str, "HSDPA-HSUPA")) - return MM_MODEM_ACCESS_TECHNOLOGY_HSPA; - - return MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; + if (strstr (str, "2g") || strstr (str, "2G")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_GSM; + if (strstr (str, "GPRS")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_GPRS; + if (strstr (str, "EDGE")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_EDGE; + if (strstr (str, "3g") || strstr (str, "3G") || strstr (str, "R99")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_UMTS; + if (strstr (str, "HSDPA-HSUPA") || strstr (str, "HSUPA-HSDPA")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_HSPA; + if (strstr (str, "HSDPA")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_HSDPA; + if (strstr (str, "HSUPA")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_HSUPA; + if (strstr (str, "HSPA+")) + technologies |= MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS; + + return technologies; } static void |