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

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

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:45:38 +00:00
parent e535c90f5f
commit aa94b21e0a
31 changed files with 241 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+16 -16
View File
@@ -42,21 +42,21 @@
#include "mm-broadband-bearer-cinterion.h"
#include "mm-iface-modem-signal.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemTime *iface_modem_time_parent;
static MMIfaceModemSignal *iface_modem_signal_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -3535,7 +3535,7 @@ iface_modem_messaging_init (MMIfaceModemMessaging *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -3547,7 +3547,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_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 (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 void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *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 MMIfaceModemLocationInterface *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)
@@ -95,7 +95,7 @@ peek_parent_interface (MMSharedCinterion *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -107,7 +107,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_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 (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 void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *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 MMIfaceModemLocationInterface *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)
@@ -94,7 +94,7 @@ peek_parent_interface (MMSharedCinterion *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -106,7 +106,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_cinterion_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedCinterion *self)
{
return iface_modem_location_parent;
src/plugins/cinterion/mm-shared-cinterion.c
+5 -5
View File
@@ -47,11 +47,11 @@ typedef struct {
/* modem */
MMIfaceModemInterface *iface_modem_parent;
/* location */
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
MMIfaceModemLocationInterface *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
/* voice */
MMIfaceModemVoice *iface_modem_voice_parent;
FeatureSupport slcc_support;
src/plugins/cinterion/mm-shared-cinterion.h
+1 -1
View File
@@ -44,7 +44,7 @@ struct _MMSharedCinterion {
MMIfaceModemInterface * (* peek_parent_interface) (MMSharedCinterion *self);
/* Peek location interface of the parent class of the object */
MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedCinterion *self);
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedCinterion *self);
/* Peek voice interface of the parent class of the object */
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);
src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
+3 -3
View File
@@ -39,12 +39,12 @@
# include "mm-log.h"
#endif
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
#if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
#endif
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFoxconn, mm_broadband_modem_mbim_foxconn, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
#if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
@@ -581,7 +581,7 @@ mm_broadband_modem_mbim_foxconn_init (MMBroadbandModemMbimFoxconn *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
src/plugins/huawei/mm-broadband-modem-huawei.c
+7 -7
View File
@@ -53,17 +53,17 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssdInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_signal_init (MMIfaceModemSignal *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -5061,7 +5061,7 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
src/plugins/intel/mm-broadband-modem-mbim-intel.c
+5 -5
View File
@@ -30,10 +30,10 @@
#include "mm-iface-modem-location.h"
#include "mm-shared-xmm.h"
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void shared_xmm_init (MMSharedXmm *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void shared_xmm_init (MMSharedXmm *iface);
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimIntel, mm_broadband_modem_mbim_intel, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)
@@ -102,7 +102,7 @@ mm_broadband_modem_mbim_intel_init (MMBroadbandModemMbimIntel *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -124,7 +124,7 @@ peek_parent_broadband_modem_class (MMSharedXmm *self)
return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_intel_parent_class);
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedXmm *self)
{
return iface_modem_location_parent;
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 (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -1585,7 +1585,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
src/plugins/option/mm-broadband-modem-hso.c
+7 -7
View File
@@ -36,13 +36,13 @@
#include "mm-bearer-list.h"
#include "mm-shared-option.h"
static void shared_option_init (MMSharedOption *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void shared_option_init (MMSharedOption *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHso, mm_broadband_modem_hso, MM_TYPE_BROADBAND_MODEM_OPTION, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_OPTION, shared_option_init)
@@ -813,7 +813,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+5 -5
View File
@@ -24,12 +24,12 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *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)
@@ -88,7 +88,7 @@ iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -113,7 +113,7 @@ peek_parent_modem_interface (MMSharedQuectel *self)
return iface_modem_parent;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_modem_location_interface (MMSharedQuectel *self)
{
return iface_modem_location_parent;
src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+4 -4
View File
@@ -27,13 +27,13 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModem3gppProfileManagerInterface *iface_modem_3gpp_profile_manager_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiQuectel, mm_broadband_modem_qmi_quectel, MM_TYPE_BROADBAND_MODEM_QMI, 0,
@@ -170,7 +170,7 @@ iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -201,7 +201,7 @@ peek_parent_modem_interface (MMSharedQuectel *self)
return iface_modem_parent;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_modem_location_interface (MMSharedQuectel *self)
{
return iface_modem_location_parent;
src/plugins/quectel/mm-broadband-modem-quectel.c
+5 -5
View File
@@ -24,12 +24,12 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_time_init (MMIfaceModemTime *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *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)
@@ -85,7 +85,7 @@ iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -116,7 +116,7 @@ peek_parent_modem_interface (MMSharedQuectel *self)
return iface_modem_parent;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_modem_location_interface (MMSharedQuectel *self)
{
return iface_modem_location_parent;
src/plugins/quectel/mm-shared-quectel.c
+9 -9
View File
@@ -48,15 +48,15 @@ typedef enum {
} FeatureSupport;
typedef struct {
MMBroadbandModemClass *broadband_modem_class_parent;
MMIfaceModemInterface *iface_modem_parent;
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource provided_sources;
MMModemLocationSource enabled_sources;
FeatureSupport qgps_supported;
GRegex *qgpsurc_regex;
GRegex *qlwurc_regex;
GRegex *rdy_regex;
MMBroadbandModemClass *broadband_modem_class_parent;
MMIfaceModemInterface *iface_modem_parent;
MMIfaceModemLocationInterface *iface_modem_location_parent;
MMModemLocationSource provided_sources;
MMModemLocationSource enabled_sources;
FeatureSupport qgps_supported;
GRegex *qgpsurc_regex;
GRegex *qlwurc_regex;
GRegex *rdy_regex;
} Private;
static void
src/plugins/quectel/mm-shared-quectel.h
+3 -3
View File
@@ -37,9 +37,9 @@ typedef struct _MMSharedQuectel MMSharedQuectel;
struct _MMSharedQuectel {
GTypeInterface g_iface;
MMBroadbandModemClass * (* peek_parent_broadband_modem_class) (MMSharedQuectel *self);
MMIfaceModemInterface * (* peek_parent_modem_interface) (MMSharedQuectel *self);
MMIfaceModemLocation * (* peek_parent_modem_location_interface) (MMSharedQuectel *self);
MMBroadbandModemClass * (* peek_parent_broadband_modem_class) (MMSharedQuectel *self);
MMIfaceModemInterface * (* peek_parent_modem_interface) (MMSharedQuectel *self);
MMIfaceModemLocationInterface * (* peek_parent_modem_location_interface) (MMSharedQuectel *self);
};
GType mm_shared_quectel_get_type (void);
src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
+7 -7
View File
@@ -28,12 +28,12 @@
#include "mm-broadband-modem-qmi-simtech.h"
#include "mm-shared-simtech.h"
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_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void shared_simtech_init (MMSharedSimtech *iface);
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiSimtech, mm_broadband_modem_qmi_simtech, MM_TYPE_BROADBAND_MODEM_QMI, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)
@@ -71,7 +71,7 @@ mm_broadband_modem_qmi_simtech_init (MMBroadbandModemQmiSimtech *self)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -83,7 +83,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_simtech_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedSimtech *self)
{
return iface_modem_location_parent;
src/plugins/simtech/mm-broadband-modem-simtech.c
+11 -11
View File
@@ -37,16 +37,16 @@
#include "mm-shared-simtech.h"
#include "mm-broadband-modem-simtech.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void shared_simtech_init (MMSharedSimtech *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void shared_simtech_init (MMSharedSimtech *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -1476,7 +1476,7 @@ iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -1488,7 +1488,7 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
iface->disable_location_gathering_finish = mm_shared_simtech_disable_location_gathering_finish;
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedSimtech *self)
{
return iface_modem_location_parent;
src/plugins/simtech/mm-shared-simtech.c
+4 -4
View File
@@ -44,10 +44,10 @@ typedef enum {
typedef struct {
/* location */
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport cgps_support;
MMIfaceModemLocationInterface *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
FeatureSupport cgps_support;
/* voice */
MMIfaceModemVoice *iface_modem_voice_parent;
FeatureSupport cpcmreg_support;
src/plugins/simtech/mm-shared-simtech.h
+1 -1
View File
@@ -38,7 +38,7 @@ struct _MMSharedSimtech {
GTypeInterface g_iface;
/* Peek location interface of the parent class of the object */
MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedSimtech *self);
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedSimtech *self);
/* Peek voice interface of the parent class of the object */
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedSimtech *self);
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 (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void shared_telit_init (MMSharedTelit *iface);
static void iface_modem_location_init (MMIfaceModemLocation *iface);
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void shared_telit_init (MMSharedTelit *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *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)
@@ -1597,7 +1597,7 @@ shared_telit_init (MMSharedTelit *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
+6 -6
View File
@@ -27,11 +27,11 @@
#include "mm-broadband-modem-mbim-xmm.h"
#include "mm-shared-xmm.h"
static void iface_modem_init (MMIfaceModemInterface *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 (MMIfaceModemLocationInterface *iface);
static void shared_xmm_init (MMSharedXmm *iface);
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmm, mm_broadband_modem_mbim_xmm, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -96,7 +96,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -118,7 +118,7 @@ peek_parent_broadband_modem_class (MMSharedXmm *self)
return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_xmm_parent_class);
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedXmm *self)
{
return iface_modem_location_parent;
src/plugins/xmm/mm-broadband-modem-xmm.c
+7 -7
View File
@@ -27,12 +27,12 @@
#include "mm-broadband-modem-xmm.h"
#include "mm-shared-xmm.h"
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 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 (MMIfaceModemLocationInterface *iface);
static MMIfaceModemLocation *iface_modem_location_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemXmm, mm_broadband_modem_xmm, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -99,7 +99,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
static void
iface_modem_location_init (MMIfaceModemLocation *iface)
iface_modem_location_init (MMIfaceModemLocationInterface *iface)
{
iface_modem_location_parent = g_type_interface_peek_parent (iface);
@@ -121,7 +121,7 @@ peek_parent_broadband_modem_class (MMSharedXmm *self)
return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_xmm_parent_class);
}
static MMIfaceModemLocation *
static MMIfaceModemLocationInterface *
peek_parent_location_interface (MMSharedXmm *self)
{
return iface_modem_location_parent;
src/plugins/xmm/mm-shared-xmm.c
+7 -7
View File
@@ -57,13 +57,13 @@ typedef struct {
MMModemMode allowed_modes;
/* Location interface support */
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
GpsEngineState gps_engine_state;
MMPortSerialAt *gps_port;
GRegex *xlsrstop_regex;
GRegex *nmea_regex;
MMIfaceModemLocationInterface *iface_modem_location_parent;
MMModemLocationSource supported_sources;
MMModemLocationSource enabled_sources;
GpsEngineState gps_engine_state;
MMPortSerialAt *gps_port;
GRegex *xlsrstop_regex;
GRegex *nmea_regex;
/* Asynchronous GPS engine stop task completion */
GTask *pending_gps_engine_stop_task;
src/plugins/xmm/mm-shared-xmm.h
+1 -1
View File
@@ -41,7 +41,7 @@ struct _MMSharedXmm {
MMBroadbandModemClass * (* peek_parent_broadband_modem_class) (MMSharedXmm *self);
/* Peek location interface of the parent class of the object */
MMIfaceModemLocation * (* peek_parent_location_interface) (MMSharedXmm *self);
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedXmm *self);
};
GType mm_shared_xmm_get_type (void);