diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-05-18 13:04:43 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-05-18 13:04:43 -0700 |
| commit | 9cbd68e96ccd9bdb32d28548ec34027d3add88c5 (patch) | |
| tree | 2b06410364ef3b5e9a29ece7227313da58eb7948 /src | |
| parent | 533ffaddc4f09ae2d75a7b092ffe0dd7f8151487 (diff) | |
cdma: return numeric ERI too
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-generic-cdma.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 4 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index 2f451704..0c185d14 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -1437,7 +1437,7 @@ reg_query_speri_done (MMAtSerialPort *port, goto done; p = mm_strip_tag (response->str, "$SPERI:"); - if (!p || !mm_cdma_parse_eri (p, &roam, NULL)) + if (!p || !mm_cdma_parse_eri (p, &roam, NULL, NULL)) goto done; /* Change the 1x and EVDO registration states to roaming if they were diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index c3a3b4ac..6e76f461 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -688,6 +688,7 @@ static const EriItem eris[] = { gboolean mm_cdma_parse_eri (const char *reply, gboolean *out_roaming, + guint32 *out_ind, const char **out_desc) { long int ind; @@ -700,6 +701,9 @@ mm_cdma_parse_eri (const char *reply, errno = 0; ind = strtol (reply, NULL, 10); if (errno == 0) { + if (out_ind) + *out_ind = ind; + while (iter->num != -1) { if (iter->num == ind) { *out_roaming = iter->roam_ind; diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 19caf950..fb100bce 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -51,6 +51,7 @@ gboolean mm_cdma_parse_spservice_response (const char *reply, gboolean mm_cdma_parse_eri (const char *reply, gboolean *out_roaming, + guint32 *out_ind, const char **out_desc); gboolean mm_gsm_parse_cscs_support_response (const char *reply, |