diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-iface-modem-cdma.c | 60 | ||||
| -rw-r--r-- | src/mm-iface-modem-cdma.h | 8 |
2 files changed, 49 insertions, 19 deletions
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 3d689e5e..9c3f0b88 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -542,6 +542,7 @@ static void interface_initialization_step (InitializationContext *ctx); typedef enum { INITIALIZATION_STEP_FIRST, INITIALIZATION_STEP_MEID, + INITIALIZATION_STEP_ESN, INITIALIZATION_STEP_LAST } InitializationStep; @@ -587,27 +588,32 @@ initialization_context_complete_and_free (InitializationContext *ctx) g_free (ctx); } -static void -load_meid_ready (MMIfaceModemCdma *self, - GAsyncResult *res, - InitializationContext *ctx) -{ - GError *error = NULL; - gchar *meid; - - meid = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->load_meid_finish (self, res, &error); - mm_gdbus_modem_cdma_set_meid (ctx->skeleton, meid); - g_free (meid); - - if (error) { - mm_warn ("couldn't load MEID: '%s'", error->message); - g_error_free (error); +#undef STR_REPLY_READY_FN +#define STR_REPLY_READY_FN(NAME,DISPLAY) \ + static void \ + load_##NAME##_ready (MMIfaceModemCdma *self, \ + GAsyncResult *res, \ + InitializationContext *ctx) \ + { \ + GError *error = NULL; \ + gchar *val; \ + \ + val = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->load_##NAME##_finish (self, res, &error); \ + mm_gdbus_modem_cdma_set_##NAME (ctx->skeleton, val); \ + g_free (val); \ + \ + if (error) { \ + mm_warn ("couldn't load %s: '%s'", DISPLAY, error->message); \ + g_error_free (error); \ + } \ + \ + /* Go on to next step */ \ + ctx->step++; \ + interface_initialization_step (ctx); \ } - /* Go on to next step */ - ctx->step++; - interface_initialization_step (ctx); -} +STR_REPLY_READY_FN (meid, "MEID") +STR_REPLY_READY_FN (esn, "ESN") static void interface_initialization_step (InitializationContext *ctx) @@ -633,6 +639,22 @@ interface_initialization_step (InitializationContext *ctx) /* Fall down to next step */ ctx->step++; + case INITIALIZATION_STEP_ESN: + /* ESN value is meant to be loaded only once during the whole + * lifetime of the modem. Therefore, if we already have it loaded, + * don't try to load it again. */ + if (!mm_gdbus_modem_cdma_get_esn (ctx->skeleton) && + MM_IFACE_MODEM_CDMA_GET_INTERFACE (ctx->self)->load_esn && + MM_IFACE_MODEM_CDMA_GET_INTERFACE (ctx->self)->load_esn_finish) { + MM_IFACE_MODEM_CDMA_GET_INTERFACE (ctx->self)->load_esn ( + ctx->self, + (GAsyncReadyCallback)load_esn_ready, + ctx); + return; + } + /* Fall down to next step */ + ctx->step++; + case INITIALIZATION_STEP_LAST: /* We are done without errors! */ diff --git a/src/mm-iface-modem-cdma.h b/src/mm-iface-modem-cdma.h index 1ed1c7e7..dc47fb09 100644 --- a/src/mm-iface-modem-cdma.h +++ b/src/mm-iface-modem-cdma.h @@ -43,6 +43,14 @@ struct _MMIfaceModemCdma { GAsyncResult *res, GError **error); + /* Loading of the ESN property */ + void (*load_esn) (MMIfaceModemCdma *self, + GAsyncReadyCallback callback, + gpointer user_data); + gchar * (*load_esn_finish) (MMIfaceModemCdma *self, + GAsyncResult *res, + GError **error); + /* OTA activation */ void (* activate) (MMIfaceModemCdma *self, const gchar *carrier, |