SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared-cinterion: use G_DECLARE|DEFINE_INTERFACE() macros

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:39 +00:00
parent e4e6857aed
commit 4afb6a3172
5 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+2 -2
View File
@@ -49,7 +49,7 @@ static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void shared_cinterion_init (MMSharedCinterionInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -3596,7 +3596,7 @@ peek_parent_time_interface (MMSharedCinterion *self)
}
static void
shared_cinterion_init (MMSharedCinterion *iface)
shared_cinterion_init (MMSharedCinterionInterface *iface)
{
iface->peek_parent_interface = peek_parent_interface;
iface->peek_parent_location_interface = peek_parent_location_interface;
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+2 -2
View File
@@ -34,7 +34,7 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void shared_cinterion_init (MMSharedCinterionInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -156,7 +156,7 @@ peek_parent_time_interface (MMSharedCinterion *self)
}
static void
shared_cinterion_init (MMSharedCinterion *iface)
shared_cinterion_init (MMSharedCinterionInterface *iface)
{
iface->peek_parent_interface = peek_parent_interface;
iface->peek_parent_location_interface = peek_parent_location_interface;
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+2 -2
View File
@@ -35,7 +35,7 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void shared_cinterion_init (MMSharedCinterionInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -155,7 +155,7 @@ peek_parent_time_interface (MMSharedCinterion *self)
}
static void
shared_cinterion_init (MMSharedCinterion *iface)
shared_cinterion_init (MMSharedCinterionInterface *iface)
{
iface->peek_parent_interface = peek_parent_interface;
iface->peek_parent_location_interface = peek_parent_location_interface;
src/plugins/cinterion/mm-shared-cinterion.c
+11 -31
View File
@@ -31,6 +31,8 @@
#include "mm-shared-cinterion.h"
#include "mm-modem-helpers-cinterion.h"
G_DEFINE_INTERFACE (MMSharedCinterion, mm_shared_cinterion, MM_TYPE_IFACE_MODEM)
/*****************************************************************************/
/* Private data context */
@@ -92,17 +94,17 @@ get_private (MMSharedCinterion *self)
/* Setup parent class' MMIfaceModem, MMIfaceModemLocation, MMIfaceModemVoice
* and MMIfaceModemTime */
g_assert (MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_interface);
priv->iface_modem_parent = MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_interface (self);
g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_interface);
priv->iface_modem_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_interface (self);
g_assert (MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_location_interface);
priv->iface_modem_location_parent = MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_location_interface (self);
g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_location_interface);
priv->iface_modem_location_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_location_interface (self);
g_assert (MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_voice_interface);
priv->iface_modem_voice_parent = MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_voice_interface (self);
g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_voice_interface);
priv->iface_modem_voice_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_voice_interface (self);
g_assert (MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_time_interface);
priv->iface_modem_time_parent = MM_SHARED_CINTERION_GET_INTERFACE (self)->peek_parent_time_interface (self);
g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_time_interface);
priv->iface_modem_time_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_time_interface (self);
g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
}
@@ -1574,28 +1576,6 @@ mm_shared_cinterion_time_setup_unsolicited_events (MMIfaceModemTime *self,
/*****************************************************************************/
static void
shared_cinterion_init (gpointer g_iface)
mm_shared_cinterion_default_init (MMSharedCinterionInterface *iface)
{
}
GType
mm_shared_cinterion_get_type (void)
{
static GType shared_cinterion_type = 0;
if (!G_UNLIKELY (shared_cinterion_type)) {
static const GTypeInfo info = {
sizeof (MMSharedCinterion), /* class_size */
shared_cinterion_init, /* base_init */
NULL, /* base_finalize */
};
shared_cinterion_type = g_type_register_static (G_TYPE_INTERFACE, "MMSharedCinterion", &info, 0);
g_type_interface_add_prerequisite (shared_cinterion_type, MM_TYPE_IFACE_MODEM);
g_type_interface_add_prerequisite (shared_cinterion_type, MM_TYPE_IFACE_MODEM_VOICE);
g_type_interface_add_prerequisite (shared_cinterion_type, MM_TYPE_IFACE_MODEM_TIME);
g_type_interface_add_prerequisite (shared_cinterion_type, MM_TYPE_IFACE_MODEM_LOCATION);
}
return shared_cinterion_type;
}
src/plugins/cinterion/mm-shared-cinterion.h
+3 -9
View File
@@ -30,14 +30,10 @@
#include "mm-iface-modem-voice.h"
#include "mm-iface-modem-time.h"
#define MM_TYPE_SHARED_CINTERION (mm_shared_cinterion_get_type ())
#define MM_SHARED_CINTERION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_CINTERION, MMSharedCinterion))
#define MM_IS_SHARED_CINTERION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SHARED_CINTERION))
#define MM_SHARED_CINTERION_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_SHARED_CINTERION, MMSharedCinterion))
#define MM_TYPE_SHARED_CINTERION mm_shared_cinterion_get_type ()
G_DECLARE_INTERFACE (MMSharedCinterion, mm_shared_cinterion, MM, SHARED_CINTERION, MMIfaceModem)
typedef struct _MMSharedCinterion MMSharedCinterion;
struct _MMSharedCinterion {
struct _MMSharedCinterionInterface {
GTypeInterface g_iface;
/* Peek modem interface of the parent class of the object */
@@ -53,8 +49,6 @@ struct _MMSharedCinterion {
MMIfaceModemTimeInterface * (* peek_parent_time_interface) (MMSharedCinterion *self);
};
GType mm_shared_cinterion_get_type (void);
/*****************************************************************************/
/* Modem interface */