diff options
Diffstat (limited to 'src')
6 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c index 0b3a386d..1faf1ae7 100644 --- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c @@ -735,10 +735,10 @@ iface_modem_firmware_init (MMIfaceModemFirmware *iface) iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish; } -static MMBroadbandModemClass * -peek_parent_broadband_modem_class (MMSharedFibocom *self) +static MMBaseModemClass * +peek_parent_class (MMSharedFibocom *self) { - return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_fibocom_parent_class); + return MM_BASE_MODEM_CLASS (mm_broadband_modem_fibocom_parent_class); } static MMIfaceModem3gpp * @@ -750,7 +750,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self) static void shared_fibocom_init (MMSharedFibocom *iface) { - iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class; + iface->peek_parent_class = peek_parent_class; iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface; } diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c index 9487289c..df66da3d 100644 --- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c @@ -85,10 +85,10 @@ iface_modem_firmware_init (MMIfaceModemFirmware *iface) iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish; } -static MMBroadbandModemClass * -peek_parent_broadband_modem_class (MMSharedFibocom *self) +static MMBaseModemClass * +peek_parent_class (MMSharedFibocom *self) { - return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_fibocom_parent_class); + return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_fibocom_parent_class); } static MMIfaceModem3gpp * @@ -100,7 +100,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self) static void shared_fibocom_init (MMSharedFibocom *iface) { - iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class; + iface->peek_parent_class = peek_parent_class; iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface; } 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 8592f77e..239247a2 100644 --- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c +++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c @@ -88,10 +88,10 @@ iface_modem_firmware_init (MMIfaceModemFirmware *iface) iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish; } -static MMBroadbandModemClass * -peek_parent_broadband_modem_class (MMSharedFibocom *self) +static MMBaseModemClass * +peek_parent_class (MMSharedFibocom *self) { - return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_xmm_fibocom_parent_class); + return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_xmm_fibocom_parent_class); } static MMIfaceModem3gpp * @@ -103,7 +103,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self) static void shared_fibocom_init (MMSharedFibocom *iface) { - iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class; + iface->peek_parent_class = peek_parent_class; iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface; } diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c index 8c8a01b5..50ac892e 100644 --- a/src/plugins/fibocom/mm-shared-fibocom.c +++ b/src/plugins/fibocom/mm-shared-fibocom.c @@ -37,8 +37,8 @@ static GQuark private_quark; typedef struct { - /* Broadband modem class support */ - MMBroadbandModemClass *broadband_modem_class_parent; + /* Parent class */ + MMBaseModemClass *class_parent; /* 3GPP interface support */ MMIfaceModem3gpp *iface_modem_3gpp_parent; /* URCs to ignore */ @@ -67,9 +67,9 @@ get_private (MMSharedFibocom *self) priv->sim_ready_regex = g_regex_new ("\\r\\n\\+SIM READY\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); - /* Setup parent class' MMBroadbandModemClass */ - g_assert (MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_broadband_modem_class); - priv->broadband_modem_class_parent = MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_broadband_modem_class (self); + /* Setup parent class */ + g_assert (MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_class); + priv->class_parent = MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_class (self); /* Setup parent class' MMIfaceModem3gpp */ g_assert (MM_SHARED_FIBOCOM_GET_INTERFACE (self)->peek_parent_3gpp_interface); @@ -93,11 +93,11 @@ mm_shared_fibocom_setup_ports (MMBroadbandModem *self) mm_obj_dbg (self, "setting up ports in fibocom modem..."); priv = get_private (MM_SHARED_FIBOCOM (self)); - g_assert (priv->broadband_modem_class_parent); - g_assert (priv->broadband_modem_class_parent->setup_ports); + g_assert (priv->class_parent); + g_assert (MM_BROADBAND_MODEM_CLASS (priv->class_parent)->setup_ports); /* Parent setup first always */ - priv->broadband_modem_class_parent->setup_ports (self); + MM_BROADBAND_MODEM_CLASS (priv->class_parent)->setup_ports (self); ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self)); diff --git a/src/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h index 441e41af..ac2adb3b 100644 --- a/src/plugins/fibocom/mm-shared-fibocom.h +++ b/src/plugins/fibocom/mm-shared-fibocom.h @@ -37,8 +37,8 @@ typedef struct _MMSharedFibocom MMSharedFibocom; struct _MMSharedFibocom { GTypeInterface g_iface; - /* Peek broadband modem class of the parent class of the object */ - MMBroadbandModemClass * (* peek_parent_broadband_modem_class) (MMSharedFibocom *self); + /* Peek parent class of the object */ + MMBaseModemClass * (* peek_parent_class) (MMSharedFibocom *self); /* Peek 3GPP interface of the parent class of the object */ MMIfaceModem3gpp * (* peek_parent_3gpp_interface) (MMSharedFibocom *self); 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 6dd8d53d..08d5441a 100644 --- a/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c +++ b/src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c @@ -293,10 +293,10 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface) iface->set_initial_eps_bearer_settings_finish = mm_shared_fibocom_set_initial_eps_bearer_settings_finish; } -static MMBroadbandModemClass * -peek_parent_broadband_modem_class (MMSharedFibocom *self) +static MMBaseModemClass * +peek_parent_class (MMSharedFibocom *self) { - return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_mtk_fibocom_parent_class); + return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_mtk_fibocom_parent_class); } static MMIfaceModem3gpp * @@ -308,7 +308,7 @@ peek_parent_3gpp_interface (MMSharedFibocom *self) static void shared_fibocom_init (MMSharedFibocom *iface) { - iface->peek_parent_broadband_modem_class = peek_parent_broadband_modem_class; + iface->peek_parent_class = peek_parent_class; iface->peek_parent_3gpp_interface = peek_parent_3gpp_interface; } |