diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-08-01 09:59:01 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-08-01 10:01:57 +0200 |
| commit | 130ea74cc953e9029a9a1662a788048ac765a0b3 (patch) | |
| tree | 0191ee1942a91de8218914d6596248de12d1918a /src | |
| parent | 4f1da8797213fb79856a5e8e1c6e6dca7236c2e0 (diff) | |
iface-modem: move sim hot swap ready to correct place in sequence
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-iface-modem.c | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 48105afe..9b3f2223 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -4375,6 +4375,31 @@ load_supported_ip_families_ready (MMIfaceModem *self, UINT_REPLY_READY_FN (power_state, "power state") static void +setup_sim_hot_swap_ready (MMIfaceModem *self, + GAsyncResult *res, + GTask *task) +{ + InitializationContext *ctx; + g_autoptr(GError) error = NULL; + + ctx = g_task_get_task_data (task); + + MM_IFACE_MODEM_GET_INTERFACE (self)->setup_sim_hot_swap_finish (self, res, &error); + if (error) + mm_obj_warn (self, "SIM hot swap setup failed: %s", error->message); + else { + mm_obj_dbg (self, "SIM hot swap setup succeeded"); + g_object_set (self, + MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED, TRUE, + NULL); + } + + /* Go on to next step */ + ctx->step++; + interface_initialization_step (task); +} + +static void modem_update_lock_info_ready (MMIfaceModem *self, GAsyncResult *res, GTask *task) @@ -4617,34 +4642,6 @@ load_current_bands_ready (MMIfaceModem *self, interface_initialization_step (task); } -/*****************************************************************************/ -/* Setup SIM hot swap (Modem interface) */ -static void -setup_sim_hot_swap_ready (MMIfaceModem *self, - GAsyncResult *res, - GTask *task) -{ - InitializationContext *ctx; - GError *error = NULL; - - ctx = g_task_get_task_data (task); - - MM_IFACE_MODEM_GET_INTERFACE (self)->setup_sim_hot_swap_finish (self, res, &error); - if (error) { - mm_obj_warn (self, "SIM hot swap setup failed: %s", error->message); - g_error_free (error); - } else { - mm_obj_dbg (self, "SIM hot swap setup succeeded"); - g_object_set (self, - MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED, TRUE, - NULL); - } - - /* Go on to next step */ - ctx->step++; - interface_initialization_step (task); -} - static void interface_initialization_step (GTask *task) { |