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

iface-modem-location: use G_DECLARE|DEFINE_INTERFACE() macros

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:38 +00:00
parent e535c90f5f
commit aa94b21e0a
31 changed files with 241 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+16 -16
View File
@@ -42,21 +42,21 @@
#include "mm-broadband-bearer-cinterion.h"
#include "mm-iface-modem-signal.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *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 iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *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 MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -3535,7 +3535,7 @@ iface_modem_messaging_init (MMIfaceModemMessaging *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -3547,7 +3547,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_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 (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 void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *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 MMIfaceModemInterface *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 MMIfaceModemLocationInterface *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)
@@ -95,7 +95,7 @@ peek_parent_interface (MMSharedCinterion *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -107,7 +107,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_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 (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 void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *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 MMIfaceModemInterface *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 MMIfaceModemLocationInterface *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)
@@ -94,7 +94,7 @@ peek_parent_interface (MMSharedCinterion *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -106,7 +106,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_parent;
src/plugins/cinterion/mm-shared-cinterion.c
+5 -5
View File
@@ -47,11 +47,11 @@ typedef struct {
/* modem */
MMIfaceModemInterface *iface_modem_parent;
/* location */
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
MMIfaceModemLocationInterface *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
/* voice */
MMIfaceModemVoice *iface_modem_voice_parent;
FeatureSupport slcc_support;
src/plugins/cinterion/mm-shared-cinterion.h
+1 -1
View File
@@ -44,7 +44,7 @@ struct _MMSharedCinterion {
MMIfaceModemInterface * (* peek_parent_interface) (MMSharedCinterion *self);
/* Peek location interface of the parent class of the object */
MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedCinterion *self);
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedCinterion *self);
/* Peek voice interface of the parent class of the object */
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);