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/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);
};