diff options
Diffstat (limited to 'src/plugins')
23 files changed, 136 insertions, 137 deletions
diff --git a/src/plugins/altair/mm-broadband-modem-altair-lte.c b/src/plugins/altair/mm-broadband-modem-altair-lte.c index 3678434b..dd4d410f 100644 --- a/src/plugins/altair/mm-broadband-modem-altair-lte.c +++ b/src/plugins/altair/mm-broadband-modem-altair-lte.c @@ -41,10 +41,12 @@ #include "mm-serial-parsers.h" #include "mm-bearer-list.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *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 (MMIfaceModem3gppUssd *iface); +static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); + +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemAltairLte, mm_broadband_modem_altair_lte, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -71,9 +73,6 @@ struct _MMBroadbandModemAltairLtePrivate { GList *pco_list; }; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; - - /*****************************************************************************/ /* Modem power down (Modem interface) */ @@ -1258,7 +1257,7 @@ iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c index 78dc9bf4..1077bd56 100644 --- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c +++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c @@ -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 (MMIfaceModem3gpp *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 MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *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 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 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; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -3502,7 +3502,7 @@ peek_parent_interface (MMSharedCinterion *self) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c index 77d4f39b..c98b95db 100644 --- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c @@ -26,12 +26,12 @@ #include "mm-shared-fibocom.h" static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface); static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); static void shared_fibocom_init (MMSharedFibocom *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; static MMIfaceModem3gppProfileManager *iface_modem_3gpp_profile_manager_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemFibocom, mm_broadband_modem_fibocom, MM_TYPE_BROADBAND_MODEM, 0, @@ -707,7 +707,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); @@ -741,7 +741,7 @@ peek_parent_class (MMSharedFibocom *self) return MM_BASE_MODEM_CLASS (mm_broadband_modem_fibocom_parent_class); } -static MMIfaceModem3gpp * +static MMIfaceModem3gppInterface * peek_parent_3gpp_interface (MMSharedFibocom *self) { return iface_modem_3gpp_parent; diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c index 189af6cc..b23afd74 100644 --- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c @@ -28,11 +28,11 @@ #include "mm-broadband-modem-mbim-fibocom.h" #include "mm-shared-fibocom.h" -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void shared_fibocom_init (MMSharedFibocom *iface); -static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void shared_fibocom_init (MMSharedFibocom *iface); +static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init) @@ -70,7 +70,7 @@ mm_broadband_modem_mbim_fibocom_init (MMBroadbandModemMbimFibocom *self) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); @@ -91,7 +91,7 @@ peek_parent_class (MMSharedFibocom *self) return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_fibocom_parent_class); } -static MMIfaceModem3gpp * +static MMIfaceModem3gppInterface * peek_parent_3gpp_interface (MMSharedFibocom *self) { return iface_modem_3gpp_parent; diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c index 86afdfdf..859ec8dd 100644 --- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c @@ -28,11 +28,11 @@ #include "mm-broadband-modem-mbim-xmm-fibocom.h" #include "mm-shared-fibocom.h" -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void shared_fibocom_init (MMSharedFibocom *iface); -static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void shared_fibocom_init (MMSharedFibocom *iface); +static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_xmm_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM_XMM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init) @@ -73,7 +73,7 @@ mm_broadband_modem_mbim_xmm_fibocom_init (MMBroadbandModemMbimXmmFibocom *self) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); @@ -94,7 +94,7 @@ peek_parent_class (MMSharedFibocom *self) return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_xmm_fibocom_parent_class); } -static MMIfaceModem3gpp * +static MMIfaceModem3gppInterface * peek_parent_3gpp_interface (MMSharedFibocom *self) { return iface_modem_3gpp_parent; diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c index 562e1f79..f0644fc2 100644 --- a/src/plugins/fibocom/mm-shared-fibocom.c +++ b/src/plugins/fibocom/mm-shared-fibocom.c @@ -41,7 +41,7 @@ typedef struct { /* Parent class */ MMBaseModemClass *class_parent; /* 3GPP interface support */ - MMIfaceModem3gpp *iface_modem_3gpp_parent; + MMIfaceModem3gppInterface *iface_modem_3gpp_parent; /* URCs to ignore */ GRegex *sim_ready_regex; } Private; diff --git a/src/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h index cd763937..a8ba48bc 100644 --- a/src/plugins/fibocom/mm-shared-fibocom.h +++ b/src/plugins/fibocom/mm-shared-fibocom.h @@ -41,7 +41,7 @@ struct _MMSharedFibocom { MMBaseModemClass * (* peek_parent_class) (MMSharedFibocom *self); /* Peek 3GPP interface of the parent class of the object */ - MMIfaceModem3gpp * (* peek_parent_3gpp_interface) (MMSharedFibocom *self); + MMIfaceModem3gppInterface * (* peek_parent_3gpp_interface) (MMSharedFibocom *self); }; GType mm_shared_fibocom_get_type (void); diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c index b4262b93..81b1168f 100644 --- a/src/plugins/huawei/mm-broadband-modem-huawei.c +++ b/src/plugins/huawei/mm-broadband-modem-huawei.c @@ -50,20 +50,20 @@ #include "mm-bearer-list.h" #include "mm-sim-huawei.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); -static void iface_modem_cdma_init (MMIfaceModemCdma *iface); -static void iface_modem_time_init (MMIfaceModemTime *iface); -static void iface_modem_voice_init (MMIfaceModemVoice *iface); -static void iface_modem_signal_init (MMIfaceModemSignal *iface); - -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; -static MMIfaceModemCdma *iface_modem_cdma_parent; -static MMIfaceModemVoice *iface_modem_voice_parent; +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_cdma_init (MMIfaceModemCdma *iface); +static void iface_modem_time_init (MMIfaceModemTime *iface); +static void iface_modem_voice_init (MMIfaceModemVoice *iface); +static void iface_modem_signal_init (MMIfaceModemSignal *iface); + +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; +static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemCdma *iface_modem_cdma_parent; +static MMIfaceModemVoice *iface_modem_voice_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHuawei, mm_broadband_modem_huawei, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -5024,7 +5024,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/icera/mm-broadband-modem-icera.c b/src/plugins/icera/mm-broadband-modem-icera.c index 0d25b01e..4228024a 100644 --- a/src/plugins/icera/mm-broadband-modem-icera.c +++ b/src/plugins/icera/mm-broadband-modem-icera.c @@ -40,12 +40,12 @@ #include "mm-modem-helpers-icera.h" static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface); static void iface_modem_time_init (MMIfaceModemTime *iface); static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; static MMIfaceModem3gppProfileManager *iface_modem_3gpp_profile_manager_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIcera, mm_broadband_modem_icera, MM_TYPE_BROADBAND_MODEM, 0, @@ -2310,7 +2310,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/iridium/mm-broadband-modem-iridium.c b/src/plugins/iridium/mm-broadband-modem-iridium.c index c6e8eaa3..46542ed1 100644 --- a/src/plugins/iridium/mm-broadband-modem-iridium.c +++ b/src/plugins/iridium/mm-broadband-modem-iridium.c @@ -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 (MMIfaceModem3gpp *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 (MMIfaceModemMessaging *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) @@ -399,7 +399,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { /* Fixed operator code and name to be reported */ iface->load_operator_name = load_operator_name; diff --git a/src/plugins/mbm/mm-broadband-modem-mbm.c b/src/plugins/mbm/mm-broadband-modem-mbm.c index 09905295..ff8e1d67 100644 --- a/src/plugins/mbm/mm-broadband-modem-mbm.c +++ b/src/plugins/mbm/mm-broadband-modem-mbm.c @@ -47,13 +47,13 @@ /* sets the interval in seconds on how often the card emits the NMEA sentences */ #define MBM_GPS_NMEA_INTERVAL "5" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; +static MMIfaceModemLocation *iface_modem_location_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbm, mm_broadband_modem_mbm, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -1569,7 +1569,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/motorola/mm-broadband-modem-motorola.c b/src/plugins/motorola/mm-broadband-modem-motorola.c index 0274e1e5..ba460afa 100644 --- a/src/plugins/motorola/mm-broadband-modem-motorola.c +++ b/src/plugins/motorola/mm-broadband-modem-motorola.c @@ -28,8 +28,8 @@ #include "mm-iface-modem-3gpp.h" #include "mm-broadband-modem-motorola.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMotorola, mm_broadband_modem_motorola, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -64,7 +64,7 @@ mm_broadband_modem_motorola_init (MMBroadbandModemMotorola *self) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { /* Loading IMEI not supported */ iface->load_imei = NULL; diff --git a/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c b/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c index 68f43f43..6f5b9b52 100644 --- a/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c +++ b/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c @@ -29,12 +29,12 @@ #include "mm-broadband-modem-mbim-mtk-fibocom.h" #include "mm-shared-fibocom.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void shared_fibocom_init (MMSharedFibocom *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void shared_fibocom_init (MMSharedFibocom *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimMtkFibocom, mm_broadband_modem_mbim_mtk_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM_MTK, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -285,7 +285,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); @@ -299,7 +299,7 @@ peek_parent_class (MMSharedFibocom *self) return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_mtk_fibocom_parent_class); } -static MMIfaceModem3gpp * +static MMIfaceModem3gppInterface * peek_parent_3gpp_interface (MMSharedFibocom *self) { return iface_modem_3gpp_parent; diff --git a/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c b/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c index 2f6fd3d0..02089a76 100644 --- a/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c +++ b/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c @@ -32,11 +32,11 @@ #include "mm-iface-modem-3gpp.h" #include "mm-broadband-modem-mtk-legacy.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMtkLegacy, mm_broadband_modem_mtk_legacy, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -930,7 +930,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/novatel/mm-broadband-modem-novatel-lte.c b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c index 90264ef1..1b62196d 100644 --- a/src/plugins/novatel/mm-broadband-modem-novatel-lte.c +++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c @@ -35,10 +35,10 @@ #include "mm-modem-helpers.h" #include "mm-serial-parsers.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNovatelLte, mm_broadband_modem_novatel_lte, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -689,7 +689,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/option/mm-broadband-modem-hso.c b/src/plugins/option/mm-broadband-modem-hso.c index e5d3f59e..5ce4d2e6 100644 --- a/src/plugins/option/mm-broadband-modem-hso.c +++ b/src/plugins/option/mm-broadband-modem-hso.c @@ -36,13 +36,13 @@ #include "mm-bearer-list.h" #include "mm-shared-option.h" -static void shared_option_init (MMSharedOption *iface); -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void shared_option_init (MMSharedOption *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; +static MMIfaceModemLocation *iface_modem_location_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHso, mm_broadband_modem_hso, MM_TYPE_BROADBAND_MODEM_OPTION, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_OPTION, shared_option_init) @@ -802,7 +802,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c index 39509059..427bfba2 100644 --- a/src/plugins/option/mm-broadband-modem-option.c +++ b/src/plugins/option/mm-broadband-modem-option.c @@ -33,12 +33,12 @@ #include "mm-broadband-modem-option.h" #include "mm-shared-option.h" -static void shared_option_init (MMSharedOption *iface); -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void shared_option_init (MMSharedOption *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemOption, mm_broadband_modem_option, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_OPTION, shared_option_init) @@ -1224,7 +1224,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c index 261b4610..5501ee9b 100644 --- a/src/plugins/simtech/mm-broadband-modem-simtech.c +++ b/src/plugins/simtech/mm-broadband-modem-simtech.c @@ -37,16 +37,16 @@ #include "mm-shared-simtech.h" #include "mm-broadband-modem-simtech.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); -static void iface_modem_voice_init (MMIfaceModemVoice *iface); -static void shared_simtech_init (MMSharedSimtech *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_voice_init (MMIfaceModemVoice *iface); +static void shared_simtech_init (MMSharedSimtech *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; -static MMIfaceModemVoice *iface_modem_voice_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; +static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemVoice *iface_modem_voice_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSimtech, mm_broadband_modem_simtech, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -1460,7 +1460,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/telit/mm-broadband-modem-telit.c b/src/plugins/telit/mm-broadband-modem-telit.c index f1e8cd79..b7940555 100644 --- a/src/plugins/telit/mm-broadband-modem-telit.c +++ b/src/plugins/telit/mm-broadband-modem-telit.c @@ -36,14 +36,14 @@ #include "mm-telit-enums-types.h" #include "mm-shared-telit.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void shared_telit_init (MMSharedTelit *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); +static void shared_telit_init (MMSharedTelit *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; +static MMIfaceModemLocation *iface_modem_location_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemTelit, mm_broadband_modem_telit, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -1583,7 +1583,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/thuraya/mm-broadband-modem-thuraya.c b/src/plugins/thuraya/mm-broadband-modem-thuraya.c index 6ed2aacf..0571bb48 100644 --- a/src/plugins/thuraya/mm-broadband-modem-thuraya.c +++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.c @@ -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 (MMIfaceModem3gpp *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 (MMIfaceModemMessaging *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) @@ -255,7 +255,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { /* Fixed operator code and name to be reported */ iface->load_operator_name = load_operator_name; diff --git a/src/plugins/wavecom/mm-broadband-modem-wavecom.c b/src/plugins/wavecom/mm-broadband-modem-wavecom.c index 1b8af4be..99930110 100644 --- a/src/plugins/wavecom/mm-broadband-modem-wavecom.c +++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.c @@ -35,10 +35,10 @@ #include "mm-base-modem-at.h" #include "mm-broadband-modem-wavecom.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemWavecom, mm_broadband_modem_wavecom, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -1305,7 +1305,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/zte/mm-broadband-modem-zte-icera.c b/src/plugins/zte/mm-broadband-modem-zte-icera.c index f88f9f4e..b1581793 100644 --- a/src/plugins/zte/mm-broadband-modem-zte-icera.c +++ b/src/plugins/zte/mm-broadband-modem-zte-icera.c @@ -30,9 +30,9 @@ #include "mm-broadband-modem-zte-icera.h" #include "mm-modem-helpers.h" -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemZteIcera, mm_broadband_modem_zte_icera, MM_TYPE_BROADBAND_MODEM_ICERA, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)); @@ -183,7 +183,7 @@ finalize (GObject *object) static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/zte/mm-broadband-modem-zte.c b/src/plugins/zte/mm-broadband-modem-zte.c index f9bca7fb..23249fdc 100644 --- a/src/plugins/zte/mm-broadband-modem-zte.c +++ b/src/plugins/zte/mm-broadband-modem-zte.c @@ -32,11 +32,11 @@ #include "mm-common-zte.h" #include "mm-broadband-modem-zte.h" -static void iface_modem_init (MMIfaceModemInterface *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface); -static MMIfaceModemInterface *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gppInterface *iface_modem_3gpp_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemZte, mm_broadband_modem_zte, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -741,7 +741,7 @@ iface_modem_init (MMIfaceModemInterface *iface) } static void -iface_modem_3gpp_init (MMIfaceModem3gpp *iface) +iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface) { iface_modem_3gpp_parent = g_type_interface_peek_parent (iface); |