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

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

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:38 +00:00
parent 074277ca1a
commit 0f48695d54
15 changed files with 199 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+4 -4
View File
@@ -46,7 +46,7 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *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);
@@ -54,7 +54,7 @@ static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
static MMIfaceModemSignalInterface *iface_modem_signal_parent;
@@ -3554,7 +3554,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
iface_modem_voice_init (MMIfaceModemVoice *iface)
iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -3572,7 +3572,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
static MMIfaceModemVoice *
static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+4 -4
View File
@@ -32,13 +32,13 @@
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_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_cinterion, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
@@ -114,7 +114,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
iface_modem_voice_init (MMIfaceModemVoice *iface)
iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -132,7 +132,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
static MMIfaceModemVoice *
static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+4 -4
View File
@@ -33,13 +33,13 @@
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_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cinterion, MM_TYPE_BROADBAND_MODEM_QMI, 0,
@@ -113,7 +113,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
iface_modem_voice_init (MMIfaceModemVoice *iface)
iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -131,7 +131,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
static MMIfaceModemVoice *
static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
src/plugins/cinterion/mm-shared-cinterion.c
+3 -3
View File
@@ -53,9 +53,9 @@ typedef struct {
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
/* voice */
MMIfaceModemVoice *iface_modem_voice_parent;
FeatureSupport slcc_support;
GRegex *slcc_regex;
MMIfaceModemVoiceInterface *iface_modem_voice_parent;
FeatureSupport slcc_support;
GRegex *slcc_regex;
/* time */
MMIfaceModemTimeInterface *iface_modem_time_parent;
GRegex *ctzu_regex;
src/plugins/cinterion/mm-shared-cinterion.h
+1 -1
View File
@@ -47,7 +47,7 @@ struct _MMSharedCinterion {
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedCinterion *self);
/* Peek voice interface of the parent class of the object */
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);
MMIfaceModemVoiceInterface * (* peek_parent_voice_interface) (MMSharedCinterion *self);
/* Peek time interface of the parent class of the object */
MMIfaceModemTimeInterface * (* peek_parent_time_interface) (MMSharedCinterion *self);