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

This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:38 +00:00
parent aa94b21e0a
commit 070975736f
12 changed files with 126 additions and 154 deletions
@@ -41,10 +41,10 @@
#include "mm-serial-parsers.h"
#include "mm-bearer-list.h"
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_messaging_init (MMIfaceModemMessaging *iface);
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_messaging_init (MMIfaceModemMessagingInterface *iface);
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -1287,7 +1287,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
/* Currently no messaging is implemented - so skip checking*/
iface->check_support = NULL;
@@ -42,14 +42,14 @@
#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 (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 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_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;
@@ -3526,7 +3526,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
iface->check_support = messaging_check_support;
iface->check_support_finish = messaging_check_support_finish;
@@ -34,9 +34,9 @@
#include "mm-bearer-iridium.h"
#include "mm-modem-helpers.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_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIridium, mm_broadband_modem_iridium, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -420,7 +420,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
iface->enable_unsolicited_events = messaging_enable_unsolicited_events;
iface->enable_unsolicited_events_finish = messaging_enable_unsolicited_events_finish;
+3 -3
View File
@@ -34,8 +34,8 @@
#include "mm-broadband-modem-nokia.h"
#include "mm-sim-nokia.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -373,7 +373,7 @@ mm_broadband_modem_nokia_init (MMBroadbandModemNokia *self)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
/* Don't even try to check messaging support */
iface->check_support = NULL;
@@ -38,10 +38,10 @@
#include "libqcdm/src/result.h"
#include "mm-log-object.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *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_messaging_init (MMIfaceModemMessagingInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -1577,7 +1577,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
iface->enable_unsolicited_events = messaging_enable_unsolicited_events;
iface->enable_unsolicited_events_finish = messaging_enable_unsolicited_events_finish;
@@ -28,10 +28,10 @@
#include "mm-broadband-modem-pantech.h"
#include "mm-sim-pantech.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
static MMIfaceModemMessaging *iface_modem_messaging_parent;
static MMIfaceModemMessagingInterface *iface_modem_messaging_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemPantech, mm_broadband_modem_pantech, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -175,7 +175,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
iface_modem_messaging_parent = g_type_interface_peek_parent (iface);
@@ -34,9 +34,9 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-thuraya.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_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemThuraya, mm_broadband_modem_thuraya, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -274,7 +274,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_messaging_init (MMIfaceModemMessaging *iface)
iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
{
iface->load_supported_storages = modem_messaging_load_supported_storages;
iface->load_supported_storages_finish = modem_messaging_load_supported_storages_finish;