iface-modem: remove MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED property

This property is used in the MMIfaceModem to flag whether the SIM hot
swap setup has been performed or not. The flag is now moved to the
iface-specific private context.

The property was also used in AT-based modems, so that implementations
supporting the SIM hot swap via AT URCs could flag the upper layers
whether the enabling of the feature was done correctly or not, and if
so, create and keep the AT ports context open. But this feature only
made sense in AT-based modems, i.e. an MBIM modem that detects SIM hot
swaps via MBIM indications exclusively should not require the AT ports
context open for anything. The check in the MMBroadbandModem object
has therefore been removed, and the logic will be updated so that it
only applies to AT-based modems.

1 files changed, 12 insertions, 36 deletions

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index f711e502..f38e6b86 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -129,7 +129,6 @@ enum {
     PROP_MODEM_VOICE_CALL_LIST,
     PROP_MODEM_SIMPLE_STATUS,
     PROP_MODEM_SIM_HOT_SWAP_SUPPORTED,
-    PROP_MODEM_SIM_HOT_SWAP_CONFIGURED,
     PROP_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED,
     PROP_MODEM_PERIODIC_ACCESS_TECH_CHECK_DISABLED,
     PROP_MODEM_PERIODIC_CALL_LIST_CHECK_DISABLED,
@@ -156,7 +155,6 @@ struct _MMBroadbandModemPrivate {
     PortsContext *in_call_ports_ctx;
     gboolean modem_init_run;
     gboolean sim_hot_swap_supported;
-    gboolean sim_hot_swap_configured;
     gboolean periodic_signal_check_disabled;
     gboolean periodic_access_tech_check_disabled;
 
@@ -12632,33 +12630,25 @@ initialize_step (GTask *task)
          * (we may be re-running the initialization step after SIM-PIN unlock) */
         if (!ctx->self->priv->sim_hot_swap_ports_ctx) {
             gboolean is_sim_hot_swap_supported = FALSE;
-            gboolean is_sim_hot_swap_configured = FALSE;
 
             g_object_get (ctx->self,
-                          MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED,  &is_sim_hot_swap_supported,
-                          MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED, &is_sim_hot_swap_configured,
+                          MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED, &is_sim_hot_swap_supported,
                           NULL);
 
             if (is_sim_hot_swap_supported) {
-
-                if (!is_sim_hot_swap_configured) {
-                    mm_obj_warn (ctx->self, "SIM hot swap supported but not configured. Skipping opening ports");
+                PortsContext      *ports;
+                g_autoptr(GError)  error = NULL;
+
+                mm_obj_dbg (ctx->self, "creating ports context for SIM hot swap");
+                ports = ports_context_new ();
+                if (!ports_context_open (ctx->self, ports, FALSE, FALSE, FALSE, &error)) {
+                    mm_obj_warn (ctx->self, "couldn't open ports during modem SIM hot swap enabling: %s",
+                                 error ? error->message : "unknown reason");
                 } else {
-                    PortsContext *ports;
-                    GError *error = NULL;
-
-                    mm_obj_dbg (ctx->self, "creating ports context for SIM hot swap");
-                    ports = ports_context_new ();
-                    if (!ports_context_open (ctx->self, ports, FALSE, FALSE, FALSE, &error)) {
-                        mm_obj_warn (ctx->self, "couldn't open ports during Modem SIM hot swap enabling: %s",
-                                     error ? error->message : "unknown reason");
-                        g_error_free (error);
-                    } else {
-                        ctx->self->priv->sim_hot_swap_ports_ctx = ports_context_ref (ports);
-                    }
-
-                    ports_context_unref (ports);
+                    ctx->self->priv->sim_hot_swap_ports_ctx = ports_context_ref (ports);
                 }
+
+                ports_context_unref (ports);
             }
         } else
             mm_obj_dbg (ctx->self, "ports context for SIM hot swap already available");
@@ -12686,21 +12676,17 @@ initialize_step (GTask *task)
             } else {
                 /* Fatal SIM, firmware, or modem failure :-( */
                 gboolean is_sim_hot_swap_supported = FALSE;
-                gboolean is_sim_hot_swap_configured = FALSE;
                 MMModemStateFailedReason reason;
 
                 reason = mm_gdbus_modem_get_state_failed_reason (MM_GDBUS_MODEM (ctx->self->priv->modem_dbus_skeleton));
 
                 g_object_get (ctx->self,
                               MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED, &is_sim_hot_swap_supported,
-                              MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED, &is_sim_hot_swap_configured,
                               NULL);
 
                 if (reason == MM_MODEM_STATE_FAILED_REASON_SIM_MISSING) {
                     if (!is_sim_hot_swap_supported) {
                         mm_obj_dbg (ctx->self, "SIM is missing, but this modem does not support SIM hot swap.");
-                    } else if (!is_sim_hot_swap_configured) {
-                        mm_obj_warn (ctx->self, "SIM is missing, but SIM hot swap could not be configured.");
                     } else if (!ctx->self->priv->sim_hot_swap_ports_ctx) {
                         mm_obj_err (ctx->self, "SIM is missing and SIM hot swap is configured, but ports are not opened.");
                     } else {
@@ -13058,9 +13044,6 @@ set_property (GObject *object,
     case PROP_MODEM_SIM_HOT_SWAP_SUPPORTED:
         self->priv->sim_hot_swap_supported = g_value_get_boolean (value);
         break;
-    case PROP_MODEM_SIM_HOT_SWAP_CONFIGURED:
-        self->priv->sim_hot_swap_configured = g_value_get_boolean (value);
-        break;
     case PROP_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED:
         self->priv->periodic_signal_check_disabled = g_value_get_boolean (value);
         break;
@@ -13208,9 +13191,6 @@ get_property (GObject *object,
     case PROP_MODEM_SIM_HOT_SWAP_SUPPORTED:
         g_value_set_boolean (value, self->priv->sim_hot_swap_supported);
         break;
-    case PROP_MODEM_SIM_HOT_SWAP_CONFIGURED:
-        g_value_set_boolean (value, self->priv->sim_hot_swap_configured);
-        break;
     case PROP_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED:
         g_value_set_boolean (value, self->priv->periodic_signal_check_disabled);
         break;
@@ -13860,10 +13840,6 @@ mm_broadband_modem_class_init (MMBroadbandModemClass *klass)
                                       MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED);
 
     g_object_class_override_property (object_class,
-                                      PROP_MODEM_SIM_HOT_SWAP_CONFIGURED,
-                                      MM_IFACE_MODEM_SIM_HOT_SWAP_CONFIGURED);
-
-    g_object_class_override_property (object_class,
                                       PROP_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED,
                                       MM_IFACE_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED);