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

iface-modem-3gpp: use G_DECLARE|DEFINE_INTERFACE() macros

Browse Source
This commit is contained in:
Aleksander Morgado
2024-05-06 13:27:04 +00:00
parent 35c0a6905b
commit ab6e4bf391
28 changed files with 345 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/fibocom/mm-broadband-modem-fibocom.c
+4 -4
View File
@@ -26,12 +26,12 @@
#include "mm-shared-fibocom.h"
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *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 MMIfaceModem3gppInterface *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,
@@ -707,7 +707,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
{
iface_modem_3gpp_parent = g_type_interface_peek_parent (iface);
@@ -741,7 +741,7 @@ peek_parent_class (MMSharedFibocom *self)
return MM_BASE_MODEM_CLASS (mm_broadband_modem_fibocom_parent_class);
}
static MMIfaceModem3gpp *
static MMIfaceModem3gppInterface *
peek_parent_3gpp_interface (MMSharedFibocom *self)
{
return iface_modem_3gpp_parent;
src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+6 -6
View File
@@ -28,11 +28,11 @@
#include "mm-broadband-modem-mbim-fibocom.h"
#include "mm-shared-fibocom.h"
static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
static void shared_fibocom_init (MMSharedFibocom *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void shared_fibocom_init (MMSharedFibocom *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static MMIfaceModem3gpp *iface_modem_3gpp_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
@@ -70,7 +70,7 @@ mm_broadband_modem_mbim_fibocom_init (MMBroadbandModemMbimFibocom *self)
}
static void
iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
{
iface_modem_3gpp_parent = g_type_interface_peek_parent (iface);
@@ -91,7 +91,7 @@ peek_parent_class (MMSharedFibocom *self)
return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_fibocom_parent_class);
}
static MMIfaceModem3gpp *
static MMIfaceModem3gppInterface *
peek_parent_3gpp_interface (MMSharedFibocom *self)
{
return iface_modem_3gpp_parent;
src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+6 -6
View File
@@ -28,11 +28,11 @@
#include "mm-broadband-modem-mbim-xmm-fibocom.h"
#include "mm-shared-fibocom.h"
static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
static void shared_fibocom_init (MMSharedFibocom *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void shared_fibocom_init (MMSharedFibocom *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
static MMIfaceModem3gpp *iface_modem_3gpp_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_xmm_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM_XMM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
@@ -73,7 +73,7 @@ mm_broadband_modem_mbim_xmm_fibocom_init (MMBroadbandModemMbimXmmFibocom *self)
}
static void
iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
{
iface_modem_3gpp_parent = g_type_interface_peek_parent (iface);
@@ -94,7 +94,7 @@ peek_parent_class (MMSharedFibocom *self)
return MM_BASE_MODEM_CLASS (mm_broadband_modem_mbim_xmm_fibocom_parent_class);
}
static MMIfaceModem3gpp *
static MMIfaceModem3gppInterface *
peek_parent_3gpp_interface (MMSharedFibocom *self)
{
return iface_modem_3gpp_parent;
src/plugins/fibocom/mm-shared-fibocom.c
+1 -1
View File
@@ -41,7 +41,7 @@ typedef struct {
/* Parent class */
MMBaseModemClass *class_parent;
/* 3GPP interface support */
MMIfaceModem3gpp *iface_modem_3gpp_parent;
MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
/* URCs to ignore */
GRegex *sim_ready_regex;
} Private;
src/plugins/fibocom/mm-shared-fibocom.h
+1 -1
View File
@@ -41,7 +41,7 @@ struct _MMSharedFibocom {
MMBaseModemClass * (* peek_parent_class) (MMSharedFibocom *self);
/* Peek 3GPP interface of the parent class of the object */
MMIfaceModem3gpp * (* peek_parent_3gpp_interface) (MMSharedFibocom *self);
MMIfaceModem3gppInterface * (* peek_parent_3gpp_interface) (MMSharedFibocom *self);
};
GType mm_shared_fibocom_get_type (void);