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

iface-modem: use G_DECLARE|DEFINE_INTERFACE() macros

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:27:04 +00:00
parent 9aab129759
commit 35c0a6905b
49 changed files with 546 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+9 -9
View File
@@ -42,7 +42,7 @@
#include "mm-broadband-bearer-cinterion.h"
#include "mm-iface-modem-signal.h"
static void iface_modem_init (MMIfaceModem *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
@@ -51,12 +51,12 @@ static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModem3gpp *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemSignal *iface_modem_signal_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gpp *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemSignal *iface_modem_signal_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -3456,7 +3456,7 @@ set_primary_sim_slot_finish (MMIfaceModem *self,
}
static void
iface_modem_init (MMIfaceModem *iface)
iface_modem_init (MMIfaceModemInterface *iface)
{
iface_modem_parent = g_type_interface_peek_parent (iface);
@@ -3495,7 +3495,7 @@ iface_modem_init (MMIfaceModem *iface)
iface->set_primary_sim_slot_finish = set_primary_sim_slot_finish;
}
static MMIfaceModem *
static MMIfaceModemInterface *
peek_parent_interface (MMSharedCinterion *self)
{
return iface_modem_parent;
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+11 -11
View File
@@ -30,16 +30,16 @@
#include "mm-broadband-modem-mbim-cinterion.h"
#include "mm-shared-cinterion.h"
static void iface_modem_init (MMIfaceModem *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_cinterion, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -80,7 +80,7 @@ mm_broadband_modem_mbim_cinterion_init (MMBroadbandModemMbimCinterion *self)
}
static void
iface_modem_init (MMIfaceModem *iface)
iface_modem_init (MMIfaceModemInterface *iface)
{
iface_modem_parent = g_type_interface_peek_parent (iface);
@@ -88,7 +88,7 @@ iface_modem_init (MMIfaceModem *iface)
iface->reset_finish = mm_shared_cinterion_modem_reset_finish;
}
static MMIfaceModem *
static MMIfaceModemInterface *
peek_parent_interface (MMSharedCinterion *self)
{
return iface_modem_parent;
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+11 -11
View File
@@ -31,16 +31,16 @@
#include "mm-broadband-modem-qmi-cinterion.h"
#include "mm-shared-cinterion.h"
static void iface_modem_init (MMIfaceModem *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cinterion, MM_TYPE_BROADBAND_MODEM_QMI, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -79,7 +79,7 @@ mm_broadband_modem_qmi_cinterion_init (MMBroadbandModemQmiCinterion *self)
}
static void
iface_modem_init (MMIfaceModem *iface)
iface_modem_init (MMIfaceModemInterface *iface)
{
iface_modem_parent = g_type_interface_peek_parent (iface);
@@ -87,7 +87,7 @@ iface_modem_init (MMIfaceModem *iface)
iface->reset_finish = mm_shared_cinterion_modem_reset_finish;
}
static MMIfaceModem *
static MMIfaceModemInterface *
peek_parent_interface (MMSharedCinterion *self)
{
return iface_modem_parent;
src/plugins/cinterion/mm-shared-cinterion.c
+1 -1
View File
@@ -45,7 +45,7 @@ typedef enum {
typedef struct {
/* modem */
MMIfaceModem *iface_modem_parent;
MMIfaceModemInterface *iface_modem_parent;
/* location */
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource supported_sources;
src/plugins/cinterion/mm-shared-cinterion.h
+1 -1
View File
@@ -41,7 +41,7 @@ struct _MMSharedCinterion {
GTypeInterface g_iface;
/* Peek modem interface of the parent class of the object */
MMIfaceModem * (* peek_parent_interface) (MMSharedCinterion *self);
MMIfaceModemInterface * (* peek_parent_interface) (MMSharedCinterion *self);
/* Peek location interface of the parent class of the object */
MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedCinterion *self);