diff options
Diffstat (limited to 'src/plugins')
44 files changed, 225 insertions, 227 deletions
diff --git a/src/plugins/altair/mm-broadband-modem-altair-lte.c b/src/plugins/altair/mm-broadband-modem-altair-lte.c index 98fb6076..3678434b 100644 --- a/src/plugins/altair/mm-broadband-modem-altair-lte.c +++ b/src/plugins/altair/mm-broadband-modem-altair-lte.c @@ -41,9 +41,9 @@ #include "mm-serial-parsers.h" #include "mm-bearer-list.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface); +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); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemAltairLte, mm_broadband_modem_altair_lte, MM_TYPE_BROADBAND_MODEM, 0, @@ -626,7 +626,7 @@ altair_load_own_numbers_ready (MMIfaceModem *iface_modem, GError *error = NULL; GStrv str_list; - str_list = MM_IFACE_MODEM_GET_INTERFACE (self)->load_own_numbers_finish (MM_IFACE_MODEM (self), res, &error); + str_list = MM_IFACE_MODEM_GET_IFACE (self)->load_own_numbers_finish (MM_IFACE_MODEM (self), res, &error); if (error) { mm_obj_warn (self, "Couldn't reload Own Numbers: '%s'", error->message); g_error_free (error); @@ -656,9 +656,9 @@ altair_sim_refresh_timer_expired (MMBroadbandModemAltairLte *self) { mm_obj_dbg (self, "no more SIM refreshes, reloading own numbers and reregistering modem"); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->load_own_numbers); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->load_own_numbers_finish); - MM_IFACE_MODEM_GET_INTERFACE (self)->load_own_numbers ( + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->load_own_numbers); + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->load_own_numbers_finish); + MM_IFACE_MODEM_GET_IFACE (self)->load_own_numbers ( MM_IFACE_MODEM (self), (GAsyncReadyCallback)altair_load_own_numbers_ready, self); @@ -1220,7 +1220,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->modem_power_down = modem_power_down; iface->modem_power_down_finish = modem_power_down_finish; diff --git a/src/plugins/anydata/mm-broadband-modem-anydata.c b/src/plugins/anydata/mm-broadband-modem-anydata.c index e1bfae4f..ea2c2268 100644 --- a/src/plugins/anydata/mm-broadband-modem-anydata.c +++ b/src/plugins/anydata/mm-broadband-modem-anydata.c @@ -33,8 +33,8 @@ #include "mm-iface-modem.h" #include "mm-iface-modem-cdma.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_cdma_init (MMIfaceModemCdma *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_cdma_init (MMIfaceModemCdma *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) @@ -333,7 +333,7 @@ mm_broadband_modem_anydata_init (MMBroadbandModemAnydata *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->reset = reset; iface->reset_finish = reset_finish; diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c index a2cd9f39..78dc9bf4 100644 --- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c +++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c @@ -42,7 +42,7 @@ #include "mm-broadband-bearer-cinterion.h" #include "mm-iface-modem-signal.h" -static void iface_modem_init (MMIfaceModem *iface); +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); @@ -51,12 +51,12 @@ static void iface_modem_time_init (MMIfaceModemTime *iface); static void iface_modem_signal_init (MMIfaceModemSignal *iface); static void shared_cinterion_init (MMSharedCinterion *iface); -static MMIfaceModem *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 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; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -3456,7 +3456,7 @@ set_primary_sim_slot_finish (MMIfaceModem *self, } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -3495,7 +3495,7 @@ iface_modem_init (MMIfaceModem *iface) iface->set_primary_sim_slot_finish = set_primary_sim_slot_finish; } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_interface (MMSharedCinterion *self) { return iface_modem_parent; diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c index 64b4b584..54520a2e 100644 --- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c +++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c @@ -30,16 +30,16 @@ #include "mm-broadband-modem-mbim-cinterion.h" #include "mm-shared-cinterion.h" -static void iface_modem_init (MMIfaceModem *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 shared_cinterion_init (MMSharedCinterion *iface); +static void iface_modem_init (MMIfaceModemInterface *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 shared_cinterion_init (MMSharedCinterion *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModemLocation *iface_modem_location_parent; -static MMIfaceModemVoice *iface_modem_voice_parent; -static MMIfaceModemTime *iface_modem_time_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemVoice *iface_modem_voice_parent; +static MMIfaceModemTime *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) @@ -80,7 +80,7 @@ mm_broadband_modem_mbim_cinterion_init (MMBroadbandModemMbimCinterion *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -88,7 +88,7 @@ iface_modem_init (MMIfaceModem *iface) iface->reset_finish = mm_shared_cinterion_modem_reset_finish; } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_interface (MMSharedCinterion *self) { return iface_modem_parent; diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c index 8bd5eafc..e20b506e 100644 --- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c +++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c @@ -31,16 +31,16 @@ #include "mm-broadband-modem-qmi-cinterion.h" #include "mm-shared-cinterion.h" -static void iface_modem_init (MMIfaceModem *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 shared_cinterion_init (MMSharedCinterion *iface); +static void iface_modem_init (MMIfaceModemInterface *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 shared_cinterion_init (MMSharedCinterion *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModemLocation *iface_modem_location_parent; -static MMIfaceModemVoice *iface_modem_voice_parent; -static MMIfaceModemTime *iface_modem_time_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemVoice *iface_modem_voice_parent; +static MMIfaceModemTime *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) @@ -79,7 +79,7 @@ mm_broadband_modem_qmi_cinterion_init (MMBroadbandModemQmiCinterion *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -87,7 +87,7 @@ iface_modem_init (MMIfaceModem *iface) iface->reset_finish = mm_shared_cinterion_modem_reset_finish; } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_interface (MMSharedCinterion *self) { return iface_modem_parent; diff --git a/src/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c index cab38332..0724c3cd 100644 --- a/src/plugins/cinterion/mm-shared-cinterion.c +++ b/src/plugins/cinterion/mm-shared-cinterion.c @@ -45,7 +45,7 @@ typedef enum { typedef struct { /* modem */ - MMIfaceModem *iface_modem_parent; + MMIfaceModemInterface *iface_modem_parent; /* location */ MMIfaceModemLocation *iface_modem_location_parent; MMModemLocationSource supported_sources; diff --git a/src/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h index eb6beac8..5605408f 100644 --- a/src/plugins/cinterion/mm-shared-cinterion.h +++ b/src/plugins/cinterion/mm-shared-cinterion.h @@ -41,7 +41,7 @@ struct _MMSharedCinterion { GTypeInterface g_iface; /* Peek modem interface of the parent class of the object */ - MMIfaceModem * (* peek_parent_interface) (MMSharedCinterion *self); + MMIfaceModemInterface * (* peek_parent_interface) (MMSharedCinterion *self); /* Peek location interface of the parent class of the object */ MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedCinterion *self); diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c index 1faf1ae7..77d4f39b 100644 --- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c @@ -25,13 +25,13 @@ #include "mm-log.h" #include "mm-shared-fibocom.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *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 MMIfaceModem3gpp *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, @@ -424,7 +424,7 @@ set_initial_eps_bearer_power_up_ready (MMBaseModem *_self, ctx = g_task_get_task_data (task); - if (!MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_up_finish (MM_IFACE_MODEM (self), res, &error)) { + if (!MM_IFACE_MODEM_GET_IFACE (self)->modem_power_up_finish (MM_IFACE_MODEM (self), res, &error)) { g_prefix_error (&error, "Couldn't power up modem: "); g_task_return_error (task, error); g_object_unref (task); @@ -467,7 +467,7 @@ set_initial_eps_bearer_power_down_ready (MMBaseModem *self, ctx = g_task_get_task_data (task); - if (!MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_down_finish (MM_IFACE_MODEM (self), res, &error)) { + if (!MM_IFACE_MODEM_GET_IFACE (self)->modem_power_down_finish (MM_IFACE_MODEM (self), res, &error)) { g_prefix_error (&error, "Couldn't power down modem: "); g_task_return_error (task, error); g_object_unref (task); @@ -488,7 +488,7 @@ set_initial_eps_bearer_load_power_state_ready (MMBaseModem *self, ctx = g_task_get_task_data (task); - ctx->power_state = MM_IFACE_MODEM_GET_INTERFACE (self)->load_power_state_finish (MM_IFACE_MODEM (self), res, &error); + ctx->power_state = MM_IFACE_MODEM_GET_IFACE (self)->load_power_state_finish (MM_IFACE_MODEM (self), res, &error); if (error) { g_task_return_error (task, error); g_object_unref (task); @@ -511,9 +511,9 @@ set_initial_eps_step (GTask *task) switch (ctx->step) { case SET_INITIAL_EPS_BEARER_SETTINGS_STEP_LOAD_POWER_STATE: mm_obj_dbg (self, "querying current power state..."); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->load_power_state); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->load_power_state_finish); - MM_IFACE_MODEM_GET_INTERFACE (self)->load_power_state ( + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->load_power_state); + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->load_power_state_finish); + MM_IFACE_MODEM_GET_IFACE (self)->load_power_state ( MM_IFACE_MODEM (self), (GAsyncReadyCallback) set_initial_eps_bearer_load_power_state_ready, task); @@ -522,9 +522,9 @@ set_initial_eps_step (GTask *task) case SET_INITIAL_EPS_BEARER_SETTINGS_STEP_POWER_DOWN: if (ctx->power_state == MM_MODEM_POWER_STATE_ON) { mm_obj_dbg (self, "powering down before changing initial EPS bearer settings..."); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_down); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_down_finish); - MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_down ( + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->modem_power_down); + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->modem_power_down_finish); + MM_IFACE_MODEM_GET_IFACE (self)->modem_power_down ( MM_IFACE_MODEM (self), (GAsyncReadyCallback) set_initial_eps_bearer_power_down_ready, task); @@ -546,9 +546,9 @@ set_initial_eps_step (GTask *task) case SET_INITIAL_EPS_BEARER_SETTINGS_STEP_POWER_UP: if (ctx->power_state == MM_MODEM_POWER_STATE_ON) { mm_obj_dbg (self, "powering up after changing initial EPS bearer settings..."); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_up); - g_assert (MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_up_finish); - MM_IFACE_MODEM_GET_INTERFACE (self)->modem_power_up ( + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->modem_power_up); + g_assert (MM_IFACE_MODEM_GET_IFACE (self)->modem_power_up_finish); + MM_IFACE_MODEM_GET_IFACE (self)->modem_power_up ( MM_IFACE_MODEM (self), (GAsyncReadyCallback) set_initial_eps_bearer_power_up_ready, task); @@ -694,7 +694,7 @@ mm_broadband_modem_fibocom_init (MMBroadbandModemFibocom *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->create_bearer = modem_create_bearer; iface->create_bearer_finish = modem_create_bearer_finish; diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c index 2f7467a2..b4262b93 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 (MMIfaceModem *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 MMIfaceModem *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 (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; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHuawei, mm_broadband_modem_huawei, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -4983,7 +4983,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_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 3299f67b..0d25b01e 100644 --- a/src/plugins/icera/mm-broadband-modem-icera.c +++ b/src/plugins/icera/mm-broadband-modem-icera.c @@ -39,7 +39,7 @@ #include "mm-broadband-modem-icera.h" #include "mm-modem-helpers-icera.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface); static void iface_modem_time_init (MMIfaceModemTime *iface); @@ -2277,7 +2277,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_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 fe6bff6e..c6e8eaa3 100644 --- a/src/plugins/iridium/mm-broadband-modem-iridium.c +++ b/src/plugins/iridium/mm-broadband-modem-iridium.c @@ -34,8 +34,8 @@ #include "mm-bearer-iridium.h" #include "mm-modem-helpers.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIridium, mm_broadband_modem_iridium, MM_TYPE_BROADBAND_MODEM, 0, @@ -369,7 +369,7 @@ mm_broadband_modem_iridium_init (MMBroadbandModemIridium *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { /* Create Iridium-specific SIM and bearer*/ iface->create_sim = create_sim; diff --git a/src/plugins/linktop/mm-broadband-modem-linktop.c b/src/plugins/linktop/mm-broadband-modem-linktop.c index 6673072a..9e83f665 100644 --- a/src/plugins/linktop/mm-broadband-modem-linktop.c +++ b/src/plugins/linktop/mm-broadband-modem-linktop.c @@ -34,9 +34,9 @@ #include "mm-broadband-modem-linktop.h" #include "mm-modem-helpers-linktop.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemLinktop, mm_broadband_modem_linktop, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)) @@ -253,7 +253,7 @@ mm_broadband_modem_linktop_init (MMBroadbandModemLinktop *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/longcheer/mm-broadband-modem-longcheer.c b/src/plugins/longcheer/mm-broadband-modem-longcheer.c index 25dc381d..b7851e26 100644 --- a/src/plugins/longcheer/mm-broadband-modem-longcheer.c +++ b/src/plugins/longcheer/mm-broadband-modem-longcheer.c @@ -31,9 +31,9 @@ #include "mm-modem-helpers.h" #include "mm-broadband-modem-longcheer.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemLongcheer, mm_broadband_modem_longcheer, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)) @@ -396,7 +396,7 @@ mm_broadband_modem_longcheer_init (MMBroadbandModemLongcheer *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/mbm/mm-broadband-modem-mbm.c b/src/plugins/mbm/mm-broadband-modem-mbm.c index e888088b..09905295 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 (MMIfaceModem *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 (MMIfaceModem3gpp *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -1538,7 +1538,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_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 fbc514e2..0274e1e5 100644 --- a/src/plugins/motorola/mm-broadband-modem-motorola.c +++ b/src/plugins/motorola/mm-broadband-modem-motorola.c @@ -28,7 +28,7 @@ #include "mm-iface-modem-3gpp.h" #include "mm-broadband-modem-motorola.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMotorola, mm_broadband_modem_motorola, MM_TYPE_BROADBAND_MODEM, 0, @@ -72,7 +72,7 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { /* Loading IMEI with +CGSN is not supported, just assume we cannot load * equipment ID */ 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 67ef8dcf..68f43f43 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 (MMIfaceModem *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 (MMIfaceModem3gpp *iface); +static void shared_fibocom_init (MMSharedFibocom *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -273,7 +273,7 @@ mm_broadband_modem_mbim_mtk_fibocom_init (MMBroadbandModemMbimMtkFibocom *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c b/src/plugins/mtk/mm-broadband-modem-mtk-legacy.c index 37624db8..2f6fd3d0 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 (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -913,7 +913,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/nokia/mm-broadband-modem-nokia.c b/src/plugins/nokia/mm-broadband-modem-nokia.c index d256a0f4..41698a2c 100644 --- a/src/plugins/nokia/mm-broadband-modem-nokia.c +++ b/src/plugins/nokia/mm-broadband-modem-nokia.c @@ -34,10 +34,10 @@ #include "mm-broadband-modem-nokia.h" #include "mm-sim-nokia.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNokia, mm_broadband_modem_nokia, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -381,7 +381,7 @@ iface_modem_messaging_init (MMIfaceModemMessaging *iface) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_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 1027d22b..90264ef1 100644 --- a/src/plugins/novatel/mm-broadband-modem-novatel-lte.c +++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c @@ -35,8 +35,8 @@ #include "mm-modem-helpers.h" #include "mm-serial-parsers.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static MMIfaceModem3gpp *iface_modem_3gpp_parent; @@ -663,7 +663,7 @@ mm_broadband_modem_novatel_lte_init (MMBroadbandModemNovatelLte *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->modem_power_down = modem_power_down; iface->modem_power_down_finish = modem_power_down_finish; diff --git a/src/plugins/novatel/mm-broadband-modem-novatel.c b/src/plugins/novatel/mm-broadband-modem-novatel.c index f0cde18a..904d3c28 100644 --- a/src/plugins/novatel/mm-broadband-modem-novatel.c +++ b/src/plugins/novatel/mm-broadband-modem-novatel.c @@ -38,12 +38,12 @@ #include "libqcdm/src/result.h" #include "mm-log-object.h" -static void iface_modem_init (MMIfaceModem *iface); +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_cdma_init (MMIfaceModemCdma *iface); +static void iface_modem_time_init (MMIfaceModemTime *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemNovatel, mm_broadband_modem_novatel, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -1560,7 +1560,7 @@ mm_broadband_modem_novatel_init (MMBroadbandModemNovatel *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_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 377f2406..e5d3f59e 100644 --- a/src/plugins/option/mm-broadband-modem-hso.c +++ b/src/plugins/option/mm-broadband-modem-hso.c @@ -36,12 +36,12 @@ #include "mm-bearer-list.h" #include "mm-shared-option.h" -static void shared_option_init (MMSharedOption *iface); -static void iface_modem_init (MMIfaceModem *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 (MMIfaceModem3gpp *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModem3gpp *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, @@ -787,7 +787,7 @@ shared_option_init (MMSharedOption *iface) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->create_sim = mm_shared_option_create_sim; iface->create_sim_finish = mm_shared_option_create_sim_finish; diff --git a/src/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c index 8df1fb2a..39509059 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 (MMIfaceModem *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 (MMIfaceModem3gpp *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -1205,7 +1205,7 @@ shared_option_init (MMSharedOption *iface) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/pantech/mm-broadband-modem-pantech.c b/src/plugins/pantech/mm-broadband-modem-pantech.c index d286dc38..510ef2d4 100644 --- a/src/plugins/pantech/mm-broadband-modem-pantech.c +++ b/src/plugins/pantech/mm-broadband-modem-pantech.c @@ -28,7 +28,7 @@ #include "mm-broadband-modem-pantech.h" #include "mm-sim-pantech.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); static MMIfaceModemMessaging *iface_modem_messaging_parent; @@ -164,7 +164,7 @@ mm_broadband_modem_pantech_init (MMBroadbandModemPantech *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { /* Create Pantech-specific SIM */ iface->create_sim = create_sim; diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c index ab524103..ba345f29 100644 --- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c +++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c @@ -22,14 +22,14 @@ #include "mm-iface-modem-time.h" #include "mm-shared-quectel.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); -static void iface_modem_time_init (MMIfaceModemTime *iface); -static void shared_quectel_init (MMSharedQuectel *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_time_init (MMIfaceModemTime *iface); +static void shared_quectel_init (MMSharedQuectel *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModemLocation *iface_modem_location_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimQuectel, mm_broadband_modem_mbim_quectel, MM_TYPE_BROADBAND_MODEM_MBIM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -71,7 +71,7 @@ mm_broadband_modem_mbim_quectel_init (MMBroadbandModemMbimQuectel *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -107,7 +107,7 @@ iface_modem_time_init (MMIfaceModemTime *iface) iface->check_support_finish = mm_shared_quectel_time_check_support_finish; } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_modem_interface (MMSharedQuectel *self) { return iface_modem_parent; diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c index df990f3f..e30d4cc3 100644 --- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c +++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c @@ -25,14 +25,14 @@ #include "mm-modem-helpers-quectel.h" #include "mm-shared-quectel.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); static void iface_modem_location_init (MMIfaceModemLocation *iface); static void iface_modem_time_init (MMIfaceModemTime *iface); static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface); static void shared_quectel_init (MMSharedQuectel *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; static MMIfaceModemLocation *iface_modem_location_parent; static MMIfaceModem3gppProfileManager *iface_modem_3gpp_profile_manager_parent; @@ -153,7 +153,7 @@ mm_broadband_modem_qmi_quectel_init (MMBroadbandModemQmiQuectel *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -195,7 +195,7 @@ peek_parent_broadband_modem_class (MMSharedQuectel *self) return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_qmi_quectel_parent_class); } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_modem_interface (MMSharedQuectel *self) { return iface_modem_parent; diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c index a14bd100..91d6e4ed 100644 --- a/src/plugins/quectel/mm-broadband-modem-quectel.c +++ b/src/plugins/quectel/mm-broadband-modem-quectel.c @@ -22,14 +22,14 @@ #include "mm-iface-modem-time.h" #include "mm-shared-quectel.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); -static void iface_modem_time_init (MMIfaceModemTime *iface); -static void shared_quectel_init (MMSharedQuectel *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_firmware_init (MMIfaceModemFirmware *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_time_init (MMIfaceModemTime *iface); +static void shared_quectel_init (MMSharedQuectel *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModemLocation *iface_modem_location_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQuectel, mm_broadband_modem_quectel, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -68,7 +68,7 @@ mm_broadband_modem_quectel_init (MMBroadbandModemQuectel *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -110,7 +110,7 @@ peek_parent_broadband_modem_class (MMSharedQuectel *self) return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_quectel_parent_class); } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_modem_interface (MMSharedQuectel *self) { return iface_modem_parent; diff --git a/src/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c index 3f3b5f81..93cd3d23 100644 --- a/src/plugins/quectel/mm-shared-quectel.c +++ b/src/plugins/quectel/mm-shared-quectel.c @@ -49,7 +49,7 @@ typedef enum { typedef struct { MMBroadbandModemClass *broadband_modem_class_parent; - MMIfaceModem *iface_modem_parent; + MMIfaceModemInterface *iface_modem_parent; MMIfaceModemLocation *iface_modem_location_parent; MMModemLocationSource provided_sources; MMModemLocationSource enabled_sources; @@ -502,7 +502,7 @@ quectel_qusim_check_for_sim_swap_ready (MMIfaceModem *self, { g_autoptr(GError) error = NULL; - if (!MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap_finish (self, res, &error)) + if (!MM_IFACE_MODEM_GET_IFACE (self)->check_for_sim_swap_finish (self, res, &error)) mm_obj_warn (self, "couldn't check SIM swap: %s", error->message); else mm_obj_dbg (self, "check SIM swap completed"); @@ -513,12 +513,12 @@ quectel_qusim_unsolicited_handler (MMPortSerialAt *port, GMatchInfo *match_info, MMIfaceModem *self) { - if (!MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap || - !MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap_finish) + if (!MM_IFACE_MODEM_GET_IFACE (self)->check_for_sim_swap || + !MM_IFACE_MODEM_GET_IFACE (self)->check_for_sim_swap_finish) return; mm_obj_dbg (self, "checking SIM swap"); - MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap ( + MM_IFACE_MODEM_GET_IFACE (self)->check_for_sim_swap ( self, (GAsyncReadyCallback)quectel_qusim_check_for_sim_swap_ready, NULL); diff --git a/src/plugins/quectel/mm-shared-quectel.h b/src/plugins/quectel/mm-shared-quectel.h index 0dfcbde4..802b6c8a 100644 --- a/src/plugins/quectel/mm-shared-quectel.h +++ b/src/plugins/quectel/mm-shared-quectel.h @@ -38,7 +38,7 @@ typedef struct _MMSharedQuectel MMSharedQuectel; struct _MMSharedQuectel { GTypeInterface g_iface; MMBroadbandModemClass * (* peek_parent_broadband_modem_class) (MMSharedQuectel *self); - MMIfaceModem * (* peek_parent_modem_interface) (MMSharedQuectel *self); + MMIfaceModemInterface * (* peek_parent_modem_interface) (MMSharedQuectel *self); MMIfaceModemLocation * (* peek_parent_modem_location_interface) (MMSharedQuectel *self); }; diff --git a/src/plugins/sierra/mm-broadband-modem-sierra-icera.c b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c index bf26f8e1..1761e871 100644 --- a/src/plugins/sierra/mm-broadband-modem-sierra-icera.c +++ b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c @@ -31,7 +31,7 @@ #include "mm-common-sierra.h" #include "mm-broadband-bearer-sierra.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSierraIcera, mm_broadband_modem_sierra_icera, MM_TYPE_BROADBAND_MODEM_ICERA, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)) @@ -124,7 +124,7 @@ mm_broadband_modem_sierra_icera_init (MMBroadbandModemSierraIcera *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { mm_common_sierra_peek_parent_interfaces (iface); diff --git a/src/plugins/sierra/mm-broadband-modem-sierra.c b/src/plugins/sierra/mm-broadband-modem-sierra.c index 801428b5..c9ca5514 100644 --- a/src/plugins/sierra/mm-broadband-modem-sierra.c +++ b/src/plugins/sierra/mm-broadband-modem-sierra.c @@ -37,12 +37,12 @@ #include "mm-common-sierra.h" #include "mm-broadband-bearer-sierra.h" -static void iface_modem_init (MMIfaceModem *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 (MMIfaceModemTime *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModemCdma *iface_modem_cdma_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModemCdma *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) @@ -1869,7 +1869,7 @@ mm_broadband_modem_sierra_init (MMBroadbandModemSierra *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/sierra/mm-common-sierra.c b/src/plugins/sierra/mm-common-sierra.c index 06b889ee..74720ebe 100644 --- a/src/plugins/sierra/mm-common-sierra.c +++ b/src/plugins/sierra/mm-common-sierra.c @@ -24,7 +24,7 @@ #include "mm-modem-helpers.h" #include "mm-sim-sierra.h" -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; /*****************************************************************************/ /* Custom init and port type hints */ @@ -510,7 +510,7 @@ mm_common_sierra_setup_ports (MMBroadbandModem *self) /*****************************************************************************/ void -mm_common_sierra_peek_parent_interfaces (MMIfaceModem *iface) +mm_common_sierra_peek_parent_interfaces (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); } diff --git a/src/plugins/sierra/mm-common-sierra.h b/src/plugins/sierra/mm-common-sierra.h index 22471c0f..e24c99c8 100644 --- a/src/plugins/sierra/mm-common-sierra.h +++ b/src/plugins/sierra/mm-common-sierra.h @@ -62,6 +62,6 @@ MMBaseSim *mm_common_sierra_create_sim_finish (MMIfaceModem *self, void mm_common_sierra_setup_ports (MMBroadbandModem *self); -void mm_common_sierra_peek_parent_interfaces (MMIfaceModem *iface); +void mm_common_sierra_peek_parent_interfaces (MMIfaceModemInterface *iface); #endif /* MM_COMMON_SIERRA_H */ diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c index afe0173a..261b4610 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 (MMIfaceModem *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 (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 MMIfaceModem *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 MMIfaceModem3gpp *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) @@ -1439,7 +1439,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/telit/mm-broadband-modem-mbim-telit.c b/src/plugins/telit/mm-broadband-modem-mbim-telit.c index ae54e992..0f0c6c34 100644 --- a/src/plugins/telit/mm-broadband-modem-mbim-telit.c +++ b/src/plugins/telit/mm-broadband-modem-mbim-telit.c @@ -30,10 +30,10 @@ #include "mm-modem-helpers-telit.h" #include "mm-shared-telit.h" -static void iface_modem_init (MMIfaceModem *iface); -static void shared_telit_init (MMSharedTelit *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void shared_telit_init (MMSharedTelit *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimTelit, mm_broadband_modem_mbim_telit, MM_TYPE_BROADBAND_MODEM_MBIM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) @@ -231,7 +231,7 @@ mm_broadband_modem_mbim_telit_init (MMBroadbandModemMbimTelit *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); @@ -251,7 +251,7 @@ iface_modem_init (MMIfaceModem *iface) iface->load_revision = load_revision; } -static MMIfaceModem * +static MMIfaceModemInterface * peek_parent_modem_interface (MMSharedTelit *self) { return iface_modem_parent; diff --git a/src/plugins/telit/mm-broadband-modem-telit.c b/src/plugins/telit/mm-broadband-modem-telit.c index 5cbfd869..f1e8cd79 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 (MMIfaceModem *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 (MMIfaceModem3gpp *iface); +static void shared_telit_init (MMSharedTelit *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; -static MMIfaceModemLocation *iface_modem_location_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -1549,7 +1549,7 @@ mm_broadband_modem_telit_init (MMBroadbandModemTelit *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/telit/mm-shared-telit.c b/src/plugins/telit/mm-shared-telit.c index e0029657..9fdcc62e 100644 --- a/src/plugins/telit/mm-shared-telit.c +++ b/src/plugins/telit/mm-shared-telit.c @@ -40,12 +40,12 @@ static GQuark private_quark; typedef struct { - MMIfaceModem *iface_modem_parent; - gboolean alternate_3g_bands; - gboolean ext_4g_bands; - GArray *supported_bands; - GArray *supported_modes; - gchar *software_package_version; + MMIfaceModemInterface *iface_modem_parent; + gboolean alternate_3g_bands; + gboolean ext_4g_bands; + GArray *supported_bands; + GArray *supported_modes; + gchar *software_package_version; } Private; static void @@ -814,4 +814,3 @@ mm_shared_telit_get_type (void) return shared_telit_type; } - diff --git a/src/plugins/telit/mm-shared-telit.h b/src/plugins/telit/mm-shared-telit.h index bf093ea5..911b4cd9 100644 --- a/src/plugins/telit/mm-shared-telit.h +++ b/src/plugins/telit/mm-shared-telit.h @@ -38,7 +38,7 @@ struct _MMSharedTelit { GTypeInterface g_iface; /* Peek modem interface of the parent class of the object */ - MMIfaceModem * (* peek_parent_modem_interface) (MMSharedTelit *self); + MMIfaceModemInterface * (* peek_parent_modem_interface) (MMSharedTelit *self); }; GType mm_shared_telit_get_type (void); diff --git a/src/plugins/thuraya/mm-broadband-modem-thuraya.c b/src/plugins/thuraya/mm-broadband-modem-thuraya.c index badcf968..6ed2aacf 100644 --- a/src/plugins/thuraya/mm-broadband-modem-thuraya.c +++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.c @@ -34,8 +34,8 @@ #include "mm-modem-helpers.h" #include "mm-modem-helpers-thuraya.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static void iface_modem_messaging_init (MMIfaceModemMessaging *iface); G_DEFINE_TYPE_EXTENDED (MMBroadbandModemThuraya, mm_broadband_modem_thuraya, MM_TYPE_BROADBAND_MODEM, 0, @@ -239,7 +239,7 @@ mm_broadband_modem_thuraya_init (MMBroadbandModemThuraya *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { /* No need to power-up/power-down the modem */ iface->load_power_state = NULL; diff --git a/src/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c index e45f775b..f64240b0 100644 --- a/src/plugins/ublox/mm-broadband-modem-ublox.c +++ b/src/plugins/ublox/mm-broadband-modem-ublox.c @@ -34,8 +34,8 @@ #include "mm-modem-helpers-ublox.h" #include "mm-ublox-enums-types.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_voice_init (MMIfaceModemVoice *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_voice_init (MMIfaceModemVoice *iface); static MMIfaceModemVoice *iface_modem_voice_parent; @@ -2010,7 +2010,7 @@ mm_broadband_modem_ublox_init (MMBroadbandModemUblox *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->create_sim = modem_create_sim; iface->create_sim_finish = modem_create_sim_finish; diff --git a/src/plugins/wavecom/mm-broadband-modem-wavecom.c b/src/plugins/wavecom/mm-broadband-modem-wavecom.c index aac7eec2..1b8af4be 100644 --- a/src/plugins/wavecom/mm-broadband-modem-wavecom.c +++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.c @@ -35,8 +35,8 @@ #include "mm-base-modem-at.h" #include "mm-broadband-modem-wavecom.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static MMIfaceModem3gpp *iface_modem_3gpp_parent; @@ -1278,7 +1278,7 @@ mm_broadband_modem_wavecom_init (MMBroadbandModemWavecom *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->load_supported_modes = load_supported_modes; iface->load_supported_modes_finish = load_supported_modes_finish; diff --git a/src/plugins/x22x/mm-broadband-modem-x22x.c b/src/plugins/x22x/mm-broadband-modem-x22x.c index 4f6c75ca..d207390a 100644 --- a/src/plugins/x22x/mm-broadband-modem-x22x.c +++ b/src/plugins/x22x/mm-broadband-modem-x22x.c @@ -31,9 +31,9 @@ #include "mm-iface-modem.h" #include "mm-broadband-modem-x22x.h" -static void iface_modem_init (MMIfaceModem *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); -static MMIfaceModem *iface_modem_parent; +static MMIfaceModemInterface *iface_modem_parent; G_DEFINE_TYPE_EXTENDED (MMBroadbandModemX22x, mm_broadband_modem_x22x, MM_TYPE_BROADBAND_MODEM, 0, G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)) @@ -402,7 +402,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); diff --git a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c index 8604dfb7..9698fa51 100644 --- a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c +++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c @@ -27,9 +27,9 @@ #include "mm-broadband-modem-mbim-xmm.h" #include "mm-shared-xmm.h" -static void iface_modem_init (MMIfaceModem *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); -static void shared_xmm_init (MMSharedXmm *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void shared_xmm_init (MMSharedXmm *iface); static MMIfaceModemLocation *iface_modem_location_parent; @@ -72,7 +72,7 @@ mm_broadband_modem_mbim_xmm_init (MMBroadbandModemMbimXmm *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->load_supported_modes = mm_shared_xmm_load_supported_modes; iface->load_supported_modes_finish = mm_shared_xmm_load_supported_modes_finish; diff --git a/src/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c index 71931de9..cc7731c9 100644 --- a/src/plugins/xmm/mm-broadband-modem-xmm.c +++ b/src/plugins/xmm/mm-broadband-modem-xmm.c @@ -27,11 +27,10 @@ #include "mm-broadband-modem-xmm.h" #include "mm-shared-xmm.h" - -static void iface_modem_init (MMIfaceModem *iface); -static void shared_xmm_init (MMSharedXmm *iface); -static void iface_modem_signal_init (MMIfaceModemSignal *iface); -static void iface_modem_location_init (MMIfaceModemLocation *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void shared_xmm_init (MMSharedXmm *iface); +static void iface_modem_signal_init (MMIfaceModemSignal *iface); +static void iface_modem_location_init (MMIfaceModemLocation *iface); static MMIfaceModemLocation *iface_modem_location_parent; @@ -70,7 +69,7 @@ mm_broadband_modem_xmm_init (MMBroadbandModemXmm *self) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface->load_supported_modes = mm_shared_xmm_load_supported_modes; iface->load_supported_modes_finish = mm_shared_xmm_load_supported_modes_finish; diff --git a/src/plugins/zte/mm-broadband-modem-zte.c b/src/plugins/zte/mm-broadband-modem-zte.c index 275ad9fc..f9bca7fb 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 (MMIfaceModem *iface); -static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); +static void iface_modem_init (MMIfaceModemInterface *iface); +static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); -static MMIfaceModem *iface_modem_parent; -static MMIfaceModem3gpp *iface_modem_3gpp_parent; +static MMIfaceModemInterface *iface_modem_parent; +static MMIfaceModem3gpp *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) @@ -720,7 +720,7 @@ finalize (GObject *object) } static void -iface_modem_init (MMIfaceModem *iface) +iface_modem_init (MMIfaceModemInterface *iface) { iface_modem_parent = g_type_interface_peek_parent (iface); |