iface-modem: load MaxBearers' and MaxActiveBearers' during init

src/mm-iface-modem.c

@@ -109,6 +109,8 @@ typedef enum {
     INITIALIZATION_STEP_FIRST,
     INITIALIZATION_STEP_MODEM_CAPABILITIES,
     INITIALIZATION_STEP_CURRENT_CAPABILITIES,
+    INITIALIZATION_STEP_MAX_BEARERS,
+    INITIALIZATION_STEP_MAX_ACTIVE_BEARERS,
     INITIALIZATION_STEP_LAST
 } InitializationStep;
 
@@ -185,6 +187,8 @@ interface_initialization_finish (MMIfaceModem *self,
 
 UINT_REPLY_READY_FN (modem_capabilities, "Modem Capabilities")
 UINT_REPLY_READY_FN (current_capabilities, "Current Capabilities")
+UINT_REPLY_READY_FN (max_bearers, "Max Bearers")
+UINT_REPLY_READY_FN (max_active_bearers, "Max Active Bearers")
 
 static void
 interface_initialization_step (InitializationContext *ctx)
@@ -257,6 +261,43 @@ interface_initialization_step (InitializationContext *ctx)
             mm_gdbus_modem_get_current_capabilities (ctx->skeleton));
         break;
 
+    case INITIALIZATION_STEP_MAX_BEARERS:
+        /* Max bearers value is meant to be loaded only once during the whole
+         * lifetime of the modem. Therefore, if we already have them loaded,
+         * don't try to load them again. */
+        if (mm_gdbus_modem_get_max_bearers (ctx->skeleton) == 0 &&
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_bearers &&
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_bearers_finish) {
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_bearers (
+                ctx->self,
+                (GAsyncReadyCallback)load_max_bearers_ready,
+                ctx);
+            return;
+        }
+        /* Default to one bearer */
+        mm_gdbus_modem_set_max_bearers (ctx->skeleton, 1);
+        break;
+
+    case INITIALIZATION_STEP_MAX_ACTIVE_BEARERS:
+        /* Max active bearers value is meant to be loaded only once during the
+         * whole lifetime of the modem. Therefore, if we already have them
+         * loaded, don't try to load them again. */
+        if (mm_gdbus_modem_get_max_active_bearers (ctx->skeleton) == 0 &&
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_active_bearers &&
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_active_bearers_finish) {
+            MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_max_active_bearers (
+                ctx->self,
+                (GAsyncReadyCallback)load_max_active_bearers_ready,
+                ctx);
+            return;
+        }
+       /* If no specific way of getting max active bearers, assume they are
+        * equal to the absolute max bearers */
+        mm_gdbus_modem_set_max_active_bearers (
+            ctx->skeleton,
+            mm_gdbus_modem_get_max_bearers (ctx->skeleton));
+        break;
+
     case INITIALIZATION_STEP_LAST:
         /* We are done without errors! */
         g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);

src/mm-iface-modem.h

@@ -46,6 +46,22 @@ struct _MMIfaceModem {
     MMModemCapability (*load_current_capabilities_finish) (MMIfaceModem *self,
                                                            GAsyncResult *res,
                                                            GError **error);
+
+    /* Loading of the MaxBearers property */
+    void (*load_max_bearers) (MMIfaceModem *self,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);
+    guint (*load_max_bearers_finish) (MMIfaceModem *self,
+                                      GAsyncResult *res,
+                                      GError **error);
+
+    /* Loading of the MaxActiveBearers property */
+    void (*load_max_active_bearers) (MMIfaceModem *self,
+                                     GAsyncReadyCallback callback,
+                                     gpointer user_data);
+    guint (*load_max_active_bearers_finish) (MMIfaceModem *self,
+                                             GAsyncResult *res,
+                                             GError **error);
 };
 
 GType mm_iface_modem_get_type (void);