aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/quectel/mm-broadband-modem-qmi-quectel.c14
-rw-r--r--plugins/quectel/mm-broadband-modem-quectel.c14
-rw-r--r--plugins/quectel/mm-shared-quectel.c40
-rw-r--r--plugins/quectel/mm-shared-quectel.h3
4 files changed, 7 insertions, 64 deletions
diff --git a/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index 9548c46c..067b4601 100644
--- a/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -27,7 +27,6 @@ static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
-static MMIfaceModem *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiQuectel, mm_broadband_modem_qmi_quectel, MM_TYPE_BROADBAND_MODEM_QMI, 0,
@@ -63,18 +62,10 @@ mm_broadband_modem_qmi_quectel_init (MMBroadbandModemQmiQuectel *self)
static void
iface_modem_init (MMIfaceModem *iface)
{
- iface_modem_parent = g_type_interface_peek_parent (iface);
-
iface->setup_sim_hot_swap = mm_shared_quectel_setup_sim_hot_swap;
iface->setup_sim_hot_swap_finish = mm_shared_quectel_setup_sim_hot_swap_finish;
}
-static MMIfaceModem *
-peek_parent_modem_interface (MMSharedQuectel *self)
-{
- return iface_modem_parent;
-}
-
static void
iface_modem_firmware_init (MMIfaceModemFirmware *iface)
{
@@ -96,7 +87,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
}
static MMIfaceModemLocation *
-peek_parent_modem_location_interface (MMSharedQuectel *self)
+peek_parent_location_interface (MMSharedQuectel *self)
{
return iface_modem_location_parent;
}
@@ -111,8 +102,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
static void
shared_quectel_init (MMSharedQuectel *iface)
{
- iface->peek_parent_modem_interface = peek_parent_modem_interface;
- iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
+ iface->peek_parent_location_interface = peek_parent_location_interface;
}
static void
diff --git a/plugins/quectel/mm-broadband-modem-quectel.c b/plugins/quectel/mm-broadband-modem-quectel.c
index ae2b7234..f6b6e176 100644
--- a/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/plugins/quectel/mm-broadband-modem-quectel.c
@@ -27,7 +27,6 @@ static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
-static MMIfaceModem *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQuectel, mm_broadband_modem_quectel, MM_TYPE_BROADBAND_MODEM, 0,
@@ -63,18 +62,10 @@ mm_broadband_modem_quectel_init (MMBroadbandModemQuectel *self)
static void
iface_modem_init (MMIfaceModem *iface)
{
- iface_modem_parent = g_type_interface_peek_parent (iface);
-
iface->setup_sim_hot_swap = mm_shared_quectel_setup_sim_hot_swap;
iface->setup_sim_hot_swap_finish = mm_shared_quectel_setup_sim_hot_swap_finish;
}
-static MMIfaceModem *
-peek_parent_modem_interface (MMSharedQuectel *self)
-{
- return iface_modem_parent;
-}
-
static void
iface_modem_firmware_init (MMIfaceModemFirmware *iface)
{
@@ -96,7 +87,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
}
static MMIfaceModemLocation *
-peek_parent_modem_location_interface (MMSharedQuectel *self)
+peek_parent_location_interface (MMSharedQuectel *self)
{
return iface_modem_location_parent;
}
@@ -111,8 +102,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
static void
shared_quectel_init (MMSharedQuectel *iface)
{
- iface->peek_parent_modem_interface = peek_parent_modem_interface;
- iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
+ iface->peek_parent_location_interface = peek_parent_location_interface;
}
static void
diff --git a/plugins/quectel/mm-shared-quectel.c b/plugins/quectel/mm-shared-quectel.c
index 0274fbe1..4d8423ae 100644
--- a/plugins/quectel/mm-shared-quectel.c
+++ b/plugins/quectel/mm-shared-quectel.c
@@ -43,7 +43,6 @@ typedef enum {
} FeatureSupport;
typedef struct {
- MMIfaceModem *iface_modem_parent;
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource provided_sources;
MMModemLocationSource enabled_sources;
@@ -66,11 +65,8 @@ get_private (MMSharedQuectel *self)
priv->enabled_sources = MM_MODEM_LOCATION_SOURCE_NONE;
priv->qgps_supported = FEATURE_SUPPORT_UNKNOWN;
- g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_location_interface);
- priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_location_interface (self);
-
- g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_interface);
- priv->iface_modem_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_modem_interface (self);
+ g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface);
+ priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface (self);
g_object_set_qdata (G_OBJECT (self), private_quark, priv);
}
@@ -174,37 +170,16 @@ mm_shared_quectel_setup_sim_hot_swap_finish (MMIfaceModem *self,
return g_task_propagate_boolean (G_TASK (res), error);
}
-static void
-parent_setup_sim_hot_swap_ready (MMIfaceModem *self,
- GAsyncResult *res,
- GTask *task)
-{
- Private *priv;
- g_autoptr(GError) error = NULL;
-
- priv = get_private (MM_SHARED_QUECTEL (self));
-
- if (!priv->iface_modem_parent->setup_sim_hot_swap_finish (self, res, &error))
- mm_obj_dbg (self, "additional SIM hot swap detection setup failed: %s", error->message);
-
- /* The +QUSIM based setup never fails, so we can safely return success here */
- g_task_return_boolean (task, TRUE);
- g_object_unref (task);
-}
-
void
mm_shared_quectel_setup_sim_hot_swap (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- Private *priv;
MMPortSerialAt *ports[2];
GTask *task;
GRegex *pattern;
guint i;
- priv = get_private (MM_SHARED_QUECTEL (self));
-
task = g_task_new (self, NULL, callback, user_data);
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -225,17 +200,6 @@ mm_shared_quectel_setup_sim_hot_swap (MMIfaceModem *self,
g_regex_unref (pattern);
mm_obj_dbg (self, "+QUSIM detection set up");
-
- /* Now, if available, setup parent logic */
- if (priv->iface_modem_parent->setup_sim_hot_swap &&
- priv->iface_modem_parent->setup_sim_hot_swap_finish) {
- priv->iface_modem_parent->setup_sim_hot_swap (self,
- (GAsyncReadyCallback) parent_setup_sim_hot_swap_ready,
- task);
- return;
- }
-
- /* Otherwise, we're done */
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
diff --git a/plugins/quectel/mm-shared-quectel.h b/plugins/quectel/mm-shared-quectel.h
index 1a49c29b..88023b3b 100644
--- a/plugins/quectel/mm-shared-quectel.h
+++ b/plugins/quectel/mm-shared-quectel.h
@@ -37,8 +37,7 @@ typedef struct _MMSharedQuectel MMSharedQuectel;
struct _MMSharedQuectel {
GTypeInterface g_iface;
- MMIfaceModem * (* peek_parent_modem_interface) (MMSharedQuectel *self);
- MMIfaceModemLocation * (* peek_parent_modem_location_interface) (MMSharedQuectel *self);
+ MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedQuectel *self);
};
GType mm_shared_quectel_get_type (void);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 11:01:35 +0000