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