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

This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:39 +00:00
parent 92a89efd02
commit 1c919890c6
9 changed files with 153 additions and 180 deletions
@@ -33,8 +33,8 @@
#include "mm-iface-modem.h"
#include "mm-iface-modem-cdma.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemAnydata, mm_broadband_modem_anydata, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -340,7 +340,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_cdma_init (MMIfaceModemCdma *iface)
iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface)
{
iface->get_cdma1x_serving_system = NULL;
iface->get_cdma1x_serving_system_finish = NULL;
@@ -54,7 +54,7 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
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_cdma_init (MMIfaceModemCdmaInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
@@ -62,7 +62,7 @@ static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
static MMIfaceModemCdmaInterface *iface_modem_cdma_parent;
static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHuawei, mm_broadband_modem_huawei, MM_TYPE_BROADBAND_MODEM, 0,
@@ -5046,7 +5046,7 @@ iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssdInterface *iface)
}
static void
iface_modem_cdma_init (MMIfaceModemCdma *iface)
iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface)
{
iface_modem_cdma_parent = g_type_interface_peek_parent (iface);
@@ -40,7 +40,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_cdma_init (MMIfaceModemCdmaInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -1584,7 +1584,7 @@ iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
}
static void
iface_modem_cdma_init (MMIfaceModemCdma *iface)
iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface)
{
iface->get_detailed_registration_state = modem_cdma_get_detailed_registration_state;
iface->get_detailed_registration_state_finish = modem_cdma_get_detailed_registration_state_finish;
@@ -38,11 +38,11 @@
#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_cdma_init (MMIfaceModemCdmaInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemCdmaInterface *iface_modem_cdma_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSierra, mm_broadband_modem_sierra, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -1904,7 +1904,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_cdma_init (MMIfaceModemCdma *iface)
iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface)
{
iface_modem_cdma_parent = g_type_interface_peek_parent (iface);
+3 -3
View File
@@ -32,9 +32,9 @@
#include "mm-iface-modem-cdma.h"
#include "mm-iface-modem.h"
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface);
static MMIfaceModemCdma *iface_modem_cdma_parent;
static MMIfaceModemCdmaInterface *iface_modem_cdma_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemVia, mm_broadband_modem_via, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_CDMA, iface_modem_cdma_init))
@@ -518,7 +518,7 @@ finalize (GObject *object)
}
static void
iface_modem_cdma_init (MMIfaceModemCdma *iface)
iface_modem_cdma_init (MMIfaceModemCdmaInterface *iface)
{
iface_modem_cdma_parent = g_type_interface_peek_parent (iface);