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

This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:38 +00:00
parent bec62a406c
commit 074277ca1a
15 changed files with 79 additions and 107 deletions
@@ -47,7 +47,7 @@ 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_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
@@ -55,7 +55,7 @@ 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 MMIfaceModemTimeInterface *iface_modem_time_parent;
static MMIfaceModemSignalInterface *iface_modem_signal_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0,
@@ -3579,7 +3579,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -3589,7 +3589,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
static MMIfaceModemTime *
static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
@@ -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_time_init (MMIfaceModemTime *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 MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemTimeInterface *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)
@@ -139,7 +139,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -149,7 +149,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
static MMIfaceModemTime *
static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
@@ -34,13 +34,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_time_init (MMIfaceModemTime *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 MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemTimeInterface *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)
@@ -138,7 +138,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -148,7 +148,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
static MMIfaceModemTime *
static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
+2 -2
View File
@@ -57,8 +57,8 @@ typedef struct {
FeatureSupport slcc_support;
GRegex *slcc_regex;
/* time */
MMIfaceModemTime *iface_modem_time_parent;
GRegex *ctzu_regex;
MMIfaceModemTimeInterface *iface_modem_time_parent;
GRegex *ctzu_regex;
} Private;
static void
+1 -1
View File
@@ -50,7 +50,7 @@ struct _MMSharedCinterion {
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);
/* Peek time interface of the parent class of the object */
MMIfaceModemTime * (* peek_parent_time_interface) (MMSharedCinterion *self);
MMIfaceModemTimeInterface * (* peek_parent_time_interface) (MMSharedCinterion *self);
};
GType mm_shared_cinterion_get_type (void);
@@ -55,7 +55,7 @@ static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssdInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
@@ -5074,7 +5074,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
+2 -2
View File
@@ -42,7 +42,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -2342,7 +2342,7 @@ iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
@@ -41,7 +41,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -1595,7 +1595,7 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
@@ -25,7 +25,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -101,7 +101,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
@@ -28,7 +28,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
@@ -183,7 +183,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
@@ -25,7 +25,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -98,7 +98,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
@@ -37,9 +37,9 @@
#include "mm-common-sierra.h"
#include "mm-broadband-bearer-sierra.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
@@ -1919,7 +1919,7 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
}
static void
iface_modem_time_init (MMIfaceModemTime *iface)
iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;