colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem: move sim hot swap ready to correct place in sequence

Browse Source
This commit is contained in:
Aleksander Morgado
2020-08-01 09:59:01 +02:00
parent 4f1da87972
commit 130ea74cc9
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/mm-iface-modem.c
View File

@@ -4374,6 +4374,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,
@@ -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)
{