diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-23 11:42:50 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-23 18:56:22 +0200 |
| commit | 5764d396899c725d5702710af030d23744d3f0d4 (patch) | |
| tree | d10405a8a5ed142485488de688cb08d29b7cbb0d | |
| parent | 86e7b0e8c6d88565adcac5dcb72f87e3fd97f0d8 (diff) | |
modem-helpers: ERI parser is generic enough, not just for !SPERI
| -rw-r--r-- | plugins/novatel/mm-broadband-modem-novatel.c | 2 | ||||
| -rw-r--r-- | src/mm-broadband-modem.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 8 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c index ea4c5c26..a45bfbc8 100644 --- a/plugins/novatel/mm-broadband-modem-novatel.c +++ b/plugins/novatel/mm-broadband-modem-novatel.c @@ -616,7 +616,7 @@ parse_modem_snapshot (DetailedRegistrationStateContext *ctx, gboolean roaming = FALSE; str = g_strdup_printf ("%u", eri); - if (mm_cdma_parse_speri_read_response (str, &roaming, NULL, NULL)) { + if (mm_cdma_parse_eri (str, &roaming, NULL, NULL)) { new_state = roaming ? MM_MODEM_CDMA_REGISTRATION_STATE_HOME : MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING; if (ctx->state.detailed_cdma1x_state != MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN) ctx->state.detailed_cdma1x_state = new_state; diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index edc9507c..889ed32f 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5640,7 +5640,7 @@ speri_ready (MMIfaceModemCdma *self, /* Try to parse the results */ response = mm_strip_tag (response, "$SPERI:"); if (!response || - !mm_cdma_parse_speri_read_response (response, &roaming, NULL, NULL)) { + !mm_cdma_parse_eri (response, &roaming, NULL, NULL)) { mm_warn ("Couldn't parse SPERI response '%s'", response); detailed_registration_state_context_complete_and_free (ctx); return; diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 6717ed26..3eb953e5 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -1701,10 +1701,10 @@ static const EriItem eris[] = { }; gboolean -mm_cdma_parse_speri_read_response (const gchar *reply, - gboolean *out_roaming, - guint *out_ind, - const gchar **out_desc) +mm_cdma_parse_eri (const gchar *reply, + gboolean *out_roaming, + guint *out_ind, + const gchar **out_desc) { guint ind; const EriItem *iter = &eris[0]; diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 9733ead0..0743c35d 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -164,11 +164,11 @@ gboolean mm_cdma_parse_spservice_read_response (const gchar *reply, MMModemCdmaRegistrationState *out_cdma_1x_state, MMModemCdmaRegistrationState *out_evdo_state); -/* AT$SPERI? response parser */ -gboolean mm_cdma_parse_speri_read_response (const gchar *reply, - gboolean *out_roaming, - guint32 *out_ind, - const gchar **out_desc); +/* Generic ERI response parser */ +gboolean mm_cdma_parse_eri (const gchar *reply, + gboolean *out_roaming, + guint32 *out_ind, + const gchar **out_desc); /* AT+CRM=? response parser */ gboolean mm_cdma_parse_crm_test_response (const gchar *reply, |