aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-fibocom.c4
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c4
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c4
-rw-r--r--src/plugins/fibocom/mm-shared-fibocom.c32
-rw-r--r--src/plugins/fibocom/mm-shared-fibocom.h14
-rw-r--r--src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c4
6 files changed, 18 insertions, 44 deletions
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
index 01eb9525..68438477 100644
--- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
@@ -29,7 +29,7 @@ static void iface_modem_init (MMIfaceModemInterface
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
-static void shared_fibocom_init (MMSharedFibocom *iface);
+static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModem3gppProfileManagerInterface *iface_modem_3gpp_profile_manager_parent;
@@ -748,7 +748,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self)
}
static void
-shared_fibocom_init (MMSharedFibocom *iface)
+shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface;
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
index 5971cef5..23c55815 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
@@ -29,7 +29,7 @@
#include "mm-shared-fibocom.h"
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
-static void shared_fibocom_init (MMSharedFibocom *iface);
+static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -98,7 +98,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self)
}
static void
-shared_fibocom_init (MMSharedFibocom *iface)
+shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface;
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
index 4f99b10a..d5a63a35 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
@@ -29,7 +29,7 @@
#include "mm-shared-fibocom.h"
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
-static void shared_fibocom_init (MMSharedFibocom *iface);
+static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -101,7 +101,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self)
}
static void
-shared_fibocom_init (MMSharedFibocom *iface)
+shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface;
diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
index f0644fc2..ff7974b0 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.c
+++ b/src/plugins/fibocom/mm-shared-fibocom.c
@@ -31,6 +31,8 @@
#include "mm-port-mbim-fibocom.h"
#include "mm-base-modem-at.h"
+G_DEFINE_INTERFACE (MMSharedFibocom, mm_shared_fibocom, MM_TYPE_IFACE_MODEM)
+
/*****************************************************************************/
/* Private data context */
@@ -69,12 +71,12 @@ get_private (MMSharedFibocom *self)
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
/* Setup parent class */
- g_assert (MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_class);
- priv->class_parent = MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_class (self);
+ g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class);
+ priv->class_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class (self);
/* Setup parent class' MMIfaceModem3gpp */
- g_assert (MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_3gpp_interface);
- priv->iface_modem_3gpp_parent = MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_3gpp_interface (self);
+ g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_3gpp_interface);
+ priv->iface_modem_3gpp_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_3gpp_interface (self);
g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
}
@@ -428,26 +430,6 @@ mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
/*****************************************************************************/
static void
-shared_fibocom_init (gpointer g_iface)
-{
-}
-
-GType
-mm_shared_fibocom_get_type (void)
+mm_shared_fibocom_default_init (MMSharedFibocomInterface *iface)
{
- static GType shared_fibocom_type = 0;
-
- if (!G_UNLIKELY (shared_fibocom_type)) {
- static const GTypeInfo info = {
- sizeof (MMSharedFibocom), /* class_size */
- shared_fibocom_init, /* base_init */
- NULL, /* base_finalize */
- };
-
- shared_fibocom_type = g_type_register_static (G_TYPE_INTERFACE, "MMSharedFibocom", &info, 0);
- g_type_interface_add_prerequisite (shared_fibocom_type, MM_TYPE_IFACE_MODEM);
- g_type_interface_add_prerequisite (shared_fibocom_type, MM_TYPE_IFACE_MODEM_3GPP);
- }
-
- return shared_fibocom_type;
}
diff --git a/src/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h
index a8ba48bc..53110909 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.h
+++ b/src/plugins/fibocom/mm-shared-fibocom.h
@@ -27,14 +27,10 @@
#include "mm-iface-modem.h"
#include "mm-iface-modem-firmware.h"
-#define MM_TYPE_SHARED_FIBOCOM (mm_shared_fibocom_get_type ())
-#define MM_SHARED_FIBOCOM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_FIBOCOM, MMSharedFibocom))
-#define MM_IS_SHARED_FIBOCOM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SHARED_FIBOCOM))
-#define MM_SHARED_FIBOCOM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_SHARED_FIBOCOM, MMSharedFibocom))
+#define MM_TYPE_SHARED_FIBOCOM mm_shared_fibocom_get_type ()
+G_DECLARE_INTERFACE (MMSharedFibocom, mm_shared_fibocom, MM, SHARED_FIBOCOM, MMIfaceModem)
-typedef struct _MMSharedFibocom MMSharedFibocom;
-
-struct _MMSharedFibocom {
+struct _MMSharedFibocomInterface {
GTypeInterface g_iface;
/* Peek parent class of the object */
@@ -44,8 +40,6 @@ struct _MMSharedFibocom {
MMIfaceModem3gppInterface * (* peek_parent_3gpp_interface) (MMSharedFibocom *self);
};
-GType mm_shared_fibocom_get_type (void);
-
void mm_shared_fibocom_setup_ports (MMBroadbandModem *self);
MMPort *mm_shared_fibocom_create_usbmisc_port (MMBaseModem *self,
@@ -59,7 +53,6 @@ void mm_shared_fibocom_set_initial_eps_bearer_settings (MMIfaceModem3
MMBearerProperties *config,
GAsyncReadyCallback callback,
gpointer user_data);
-
gboolean mm_shared_fibocom_set_initial_eps_bearer_settings_finish (MMIfaceModem3gpp *self,
GAsyncResult *res,
GError **error);
@@ -67,7 +60,6 @@ gboolean mm_shared_fibocom_set_initial_eps_bearer_settings_finish (MMIfaceModem3
void mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
GAsyncReadyCallback callback,
gpointer user_data);
-
MMFirmwareUpdateSettings *mm_shared_fibocom_firmware_load_update_settings_finish (MMIfaceModemFirmware *self,
GAsyncResult *res,
GError **error);
diff --git a/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c b/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c
index 6f5b9b52..04c9d6bd 100644
--- a/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c
+++ b/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c
@@ -31,7 +31,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
-static void shared_fibocom_init (MMSharedFibocom *iface);
+static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -306,7 +306,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self)
}
static void
-shared_fibocom_init (MMSharedFibocom *iface)
+shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 12:58:43 +0000