iface-modem: create MMSim object during init

src/mm-iface-modem.c

@@ -17,11 +17,13 @@
 #include <ModemManager.h>
 
 #include <mm-gdbus-modem.h>
+#include <mm-gdbus-sim.h>
 #include <mm-enums-types.h>
 #include <mm-errors-types.h>
 
 #include "mm-iface-modem.h"
 #include "mm-base-modem.h"
+#include "mm-sim.h"
 #include "mm-log.h"
 
 typedef struct _InitializationContext InitializationContext;
@@ -291,6 +293,7 @@ typedef enum {
     INITIALIZATION_STEP_DEVICE_ID,
     INITIALIZATION_STEP_UNLOCK_REQUIRED,
     INITIALIZATION_STEP_UNLOCK_RETRIES,
+    INITIALIZATION_STEP_SIM,
     INITIALIZATION_STEP_SUPPORTED_MODES,
     INITIALIZATION_STEP_SUPPORTED_BANDS,
     INITIALIZATION_STEP_LAST
@@ -426,6 +429,61 @@ load_unlock_required_ready (MMIfaceModem *self,
 
 UINT_REPLY_READY_FN (unlock_retries, "Unlock Retries")
 
+static void
+sim_new_ready (GAsyncInitable *initable,
+               GAsyncResult *res,
+               InitializationContext *ctx)
+{
+    MMSim *sim;
+    GError *error = NULL;
+
+    sim = mm_sim_new_finish (initable, res, &error);
+    if (!sim) {
+        mm_warn ("couldn't create SIM: '%s'",
+                 error ? error->message : "Unknown error");
+        g_clear_error (&error);
+    } else {
+        gchar *path = NULL;
+
+        g_object_get (sim,
+                      MM_SIM_PATH, &path,
+                      NULL);
+        mm_gdbus_modem_set_sim (MM_GDBUS_MODEM (ctx->skeleton),
+                                path);
+        g_object_bind_property (sim, MM_SIM_PATH,
+                                ctx->skeleton, "sim",
+                                G_BINDING_DEFAULT);
+        g_free (path);
+
+        g_object_set (ctx->self,
+                      MM_IFACE_MODEM_SIM, sim,
+                      NULL);
+        g_object_unref (sim);
+    }
+
+    /* Go on to next step */
+    ctx->step++;
+    interface_initialization_step (ctx);
+}
+
+static void
+sim_reinit_ready (MMSim *sim,
+                  GAsyncResult *res,
+                  InitializationContext *ctx)
+{
+    GError *error = NULL;
+
+    if (!mm_sim_initialize_finish (sim, res, &error)) {
+        mm_warn ("SIM re-initialization failed: '%s'",
+                 error ? error->message : "Unknown error");
+        g_clear_error (&error);
+    }
+
+    /* Go on to next step */
+    ctx->step++;
+    interface_initialization_step (ctx);
+}
+
 static void
 interface_initialization_step (InitializationContext *ctx)
 {
@@ -638,6 +696,30 @@ interface_initialization_step (InitializationContext *ctx)
         }
         break;
 
+    case INITIALIZATION_STEP_SIM: {
+        MMSim *sim = NULL;
+
+        g_object_get (ctx->self,
+                      MM_IFACE_MODEM_SIM, &sim,
+                      NULL);
+        if (!sim) {
+            mm_sim_new (MM_BASE_MODEM (ctx->self),
+                        NULL, /* TODO: cancellable */
+                        (GAsyncReadyCallback)sim_new_ready,
+                        ctx);
+            return;
+        }
+
+        /* If already available the sim object, relaunch initialization.
+         * This will try to load any missing property value that couldn't be
+         * retrieved before due to having the SIM locked. */
+        mm_sim_initialize (sim,
+                           NULL, /* TODO: cancellable */
+                           (GAsyncReadyCallback)sim_reinit_ready,
+                           ctx);
+        return;
+    }
+
     case INITIALIZATION_STEP_SUPPORTED_MODES:
         /* Supported modes are meant to be loaded only once during the whole
          * lifetime of the modem. Therefore, if we already have them loaded,
@@ -915,6 +997,10 @@ mm_iface_modem_shutdown (MMIfaceModem *self,
                      "Iinterface being currently initialized");
         return FALSE;
     case INTERFACE_STATUS_INITIALIZED:
+        /* Remove SIM object */
+        g_object_set (self,
+                      MM_IFACE_MODEM_SIM, NULL,
+                      NULL);
         /* Unexport DBus interface and remove the skeleton */
         mm_gdbus_object_skeleton_set_modem (MM_GDBUS_OBJECT_SKELETON (self), NULL);
         g_object_set (self,
@@ -946,6 +1032,14 @@ iface_modem_init (gpointer g_iface)
                               MM_GDBUS_TYPE_MODEM_SKELETON,
                               G_PARAM_READWRITE));
 
+    g_object_interface_install_property
+        (g_iface,
+         g_param_spec_object (MM_IFACE_MODEM_SIM,
+                              "SIM",
+                              "SIM object",
+                              MM_TYPE_SIM,
+                              G_PARAM_READWRITE));
+
     g_object_interface_install_property
         (g_iface,
          g_param_spec_enum (MM_IFACE_MODEM_STATE,

src/mm-iface-modem.h

@@ -26,6 +26,7 @@
 
 #define MM_IFACE_MODEM_DBUS_SKELETON   "iface-modem-dbus-skeleton"
 #define MM_IFACE_MODEM_STATE           "iface-modem-state"
+#define MM_IFACE_MODEM_SIM             "iface-modem-sim"
 
 typedef struct _MMIfaceModem MMIfaceModem;