SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem: use G_DECLARE|DEFINE_INTERFACE() macros

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:27:04 +00:00
parent 9aab129759
commit 35c0a6905b
49 changed files with 546 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-mbim.c
+3 -3
View File
@@ -51,7 +51,7 @@
# include "mm-shared-qmi.h"
#endif
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_3gpp_ussd_init (MMIfaceModem3gppUssd *iface);
@@ -67,7 +67,7 @@ static void shared_qmi_init (MMSharedQmi
static MMIfaceModemLocation *iface_modem_location_parent;
#endif
static MMIfaceModemSignal *iface_modem_signal_parent;
static MMIfaceModem *iface_modem_parent;
static MMIfaceModemInterface *iface_modem_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbim, mm_broadband_modem_mbim, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -10048,7 +10048,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);
/* Initialization steps */
src/mm-broadband-modem-qmi.c
+13 -13
View File
@@ -53,19 +53,19 @@
#include "mm-call-qmi.h"
#include "mm-call-list.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_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_oma_init (MMIfaceModemOma *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_sar_init (MMIfaceModemSar *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_qmi_init (MMSharedQmi *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_oma_init (MMIfaceModemOma *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_sar_init (MMIfaceModemSar *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_qmi_init (MMSharedQmi *iface);
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemMessaging *iface_modem_messaging_parent;
@@ -13805,7 +13805,7 @@ dispose (GObject *object)
}
static void
iface_modem_init (MMIfaceModem *iface)
iface_modem_init (MMIfaceModemInterface *iface)
{
/* Initialization steps */
iface->load_current_capabilities = mm_shared_qmi_load_current_capabilities;
src/mm-broadband-modem.c
+16 -16
View File
@@ -61,20 +61,20 @@
#include "libqcdm/src/log-items.h"
#include "mm-helper-enums-types.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_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_simple_init (MMIfaceModemSimple *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *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 iface_modem_oma_init (MMIfaceModemOma *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_sar_init (MMIfaceModemSar *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssd *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_simple_init (MMIfaceModemSimple *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *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 iface_modem_oma_init (MMIfaceModemOma *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_sar_init (MMIfaceModemSar *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModem, mm_broadband_modem, MM_TYPE_BASE_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -4876,8 +4876,8 @@ registration_state_changed (MMPortSerialAt *port,
* we fight with the custom commands. Plus CREG/CGREG access technologies
* don't have fine-grained distinction between HSxPA or GPRS/EDGE, etc.
*/
if (MM_IFACE_MODEM_GET_INTERFACE (self)->load_access_technologies == modem_load_access_technologies ||
MM_IFACE_MODEM_GET_INTERFACE (self)->load_access_technologies == NULL)
if (MM_IFACE_MODEM_GET_IFACE (self)->load_access_technologies == modem_load_access_technologies ||
MM_IFACE_MODEM_GET_IFACE (self)->load_access_technologies == NULL)
mm_iface_modem_3gpp_update_access_technologies (MM_IFACE_MODEM_3GPP (self), act);
mm_iface_modem_3gpp_update_location (MM_IFACE_MODEM_3GPP (self), lac, tac, cell_id);
@@ -13478,7 +13478,7 @@ dispose (GObject *object)
}
static void
iface_modem_init (MMIfaceModem *iface)
iface_modem_init (MMIfaceModemInterface *iface)
{
/* Initialization steps */
iface->load_current_capabilities = modem_load_current_capabilities;
src/mm-iface-modem.c
+286 -304
View File
File diff suppressed because it is too large Load Diff
src/mm-iface-modem.h
+4 -10
View File
@@ -24,15 +24,14 @@
#include <libmm-glib.h>
#include "mm-charsets.h"
#include "mm-base-modem.h"
#include "mm-port-serial-at.h"
#include "mm-base-bearer.h"
#include "mm-base-sim.h"
#include "mm-bearer-list.h"
#define MM_TYPE_IFACE_MODEM (mm_iface_modem_get_type ())
#define MM_IFACE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_IFACE_MODEM, MMIfaceModem))
#define MM_IS_IFACE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_IFACE_MODEM))
#define MM_IFACE_MODEM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_IFACE_MODEM, MMIfaceModem))
#define MM_TYPE_IFACE_MODEM mm_iface_modem_get_type ()
G_DECLARE_INTERFACE (MMIfaceModem, mm_iface_modem, MM, IFACE_MODEM, MMBaseModem)
#define MM_IFACE_MODEM_DBUS_SKELETON "iface-modem-dbus-skeleton"
#define MM_IFACE_MODEM_STATE "iface-modem-state"
@@ -44,9 +43,7 @@
#define MM_IFACE_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED "iface-modem-periodic-signal-check-disabled"
#define MM_IFACE_MODEM_PERIODIC_ACCESS_TECH_CHECK_DISABLED "iface-modem-periodic-access-tech-check-disabled"
typedef struct _MMIfaceModem MMIfaceModem;
struct _MMIfaceModem {
struct _MMIfaceModemInterface {
GTypeInterface g_iface;
/* Loading of the SupportedCapabilities property */
@@ -425,9 +422,6 @@ struct _MMIfaceModem {
GError **error);
};
GType mm_iface_modem_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMIfaceModem, g_object_unref)
/* Helpers to query access technologies */
MMModemAccessTechnology mm_iface_modem_get_access_technologies (MMIfaceModem *self);
src/plugins/altair/mm-broadband-modem-altair-lte.c
+8 -8
View File
@@ -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;
src/plugins/anydata/mm-broadband-modem-anydata.c
+3 -3
View File
@@ -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;
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+9 -9
View File
@@ -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;
src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+11 -11
View File
@@ -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;
src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+11 -11
View File
@@ -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;
src/plugins/cinterion/mm-shared-cinterion.c
+1 -1
View File
@@ -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;
src/plugins/cinterion/mm-shared-cinterion.h
+1 -1
View File
@@ -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);
src/plugins/fibocom/mm-broadband-modem-fibocom.c
+15 -15
View File
@@ -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;
src/plugins/huawei/mm-broadband-modem-huawei.c
+14 -14
View File
@@ -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 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 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 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);
src/plugins/icera/mm-broadband-modem-icera.c
+2 -2
View File
@@ -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);
src/plugins/iridium/mm-broadband-modem-iridium.c
+3 -3
View File
@@ -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;
src/plugins/linktop/mm-broadband-modem-linktop.c
+3 -3
View File
@@ -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);
src/plugins/longcheer/mm-broadband-modem-longcheer.c
+3 -3
View File
@@ -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);
src/plugins/mbm/mm-broadband-modem-mbm.c
+7 -7
View File
@@ -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);
src/plugins/motorola/mm-broadband-modem-motorola.c
+2 -2
View File
@@ -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 */
src/plugins/mtk/mm-broadband-modem-mbim-mtk-fibocom.c
+6 -6
View File
@@ -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);
src/plugins/mtk/mm-broadband-modem-mtk-legacy.c
+5 -5
View File
@@ -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);
src/plugins/nokia/mm-broadband-modem-nokia.c
+3 -3
View File
@@ -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);
src/plugins/novatel/mm-broadband-modem-novatel-lte.c
+3 -3
View File
@@ -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;
src/plugins/novatel/mm-broadband-modem-novatel.c
+5 -5
View File
@@ -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);
src/plugins/option/mm-broadband-modem-hso.c
+6 -6
View File
@@ -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;
src/plugins/option/mm-broadband-modem-option.c
+6 -6
View File
@@ -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);
src/plugins/pantech/mm-broadband-modem-pantech.c
+2 -2
View File
@@ -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;
src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+9 -9
View File
@@ -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;
src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+4 -4
View File
@@ -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;
src/plugins/quectel/mm-broadband-modem-quectel.c
+9 -9
View File
@@ -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;
src/plugins/quectel/mm-shared-quectel.c
+5 -5
View File
@@ -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);
src/plugins/quectel/mm-shared-quectel.h
+1 -1
View File
@@ -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);
};
src/plugins/sierra/mm-broadband-modem-sierra-icera.c
+2 -2
View File
@@ -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);
src/plugins/sierra/mm-broadband-modem-sierra.c
+6 -6
View File
@@ -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);
src/plugins/sierra/mm-common-sierra.c
+2 -2
View File
@@ -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);
}
src/plugins/sierra/mm-common-sierra.h
+1 -1
View File
@@ -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 */
src/plugins/simtech/mm-broadband-modem-simtech.c
+10 -10
View File
@@ -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);
src/plugins/telit/mm-broadband-modem-mbim-telit.c
+5 -5
View File
@@ -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;
src/plugins/telit/mm-broadband-modem-telit.c
+8 -8
View File
@@ -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);
src/plugins/telit/mm-shared-telit.c
+6 -7
View File
@@ -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;
}
src/plugins/telit/mm-shared-telit.h
+1 -1
View File
@@ -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);
src/plugins/thuraya/mm-broadband-modem-thuraya.c
+3 -3
View File
@@ -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;
src/plugins/ublox/mm-broadband-modem-ublox.c
+3 -3
View File
@@ -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;
src/plugins/wavecom/mm-broadband-modem-wavecom.c
+3 -3
View File
@@ -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;
src/plugins/x22x/mm-broadband-modem-x22x.c
+3 -3
View File
@@ -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);
src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
+4 -4
View File
@@ -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;
src/plugins/xmm/mm-broadband-modem-xmm.c
+5 -6
View File
@@ -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;
src/plugins/zte/mm-broadband-modem-zte.c
+5 -5
View File
@@ -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);