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

Move log parent and connection property binding to helper

Browse Source 
Continues removing usage of MMBaseModem in a bunch of files
by splitting out bits of its usage to separate interfaces.

Signed-off-by: Dan Williams <dan@ioncontrol.co>
This commit is contained in:
Dan Williams
2025-05-08 20:08:06 -05:00
parent ef5cee3ab5
commit ec5104c9a8
55 changed files with 376 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/altair/mm-broadband-bearer-altair-lte.c
+2
View File
@@ -32,6 +32,7 @@
#include "mm-iface-modem-3gpp.h"
#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-bind.h"
#define CONNECTION_CHECK_TIMEOUT_SEC 5
#define STATCM_TAG "%STATCM:"
@@ -340,6 +341,7 @@ mm_broadband_bearer_altair_lte_new (MMBroadbandModemAltairLte *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/cinterion/mm-broadband-bearer-cinterion.c
+2
View File
@@ -28,6 +28,7 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-cinterion.h"
#include "mm-daemon-enums-types.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerCinterion, mm_broadband_bearer_cinterion, MM_TYPE_BROADBAND_BEARER)
@@ -767,6 +768,7 @@ mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/cinterion/mm-broadband-modem-cinterion.c
+6 -2
View File
@@ -3128,7 +3128,9 @@ cinterion_simlocal_unsolicited_handler (MMPortSerialAt *port,
if (sim == NULL && is_available) {
mm_obj_info (self, "SIM in slot %i inserted", i + 1);
sim = mm_base_sim_new_initialized (MM_BASE_MODEM (self), i + 1, FALSE,
sim = mm_base_sim_new_initialized (MM_BASE_MODEM (self),
G_OBJECT (self),
i + 1, FALSE,
NULL, NULL, NULL, NULL, NULL, NULL);
mm_iface_modem_modify_sim (MM_IFACE_MODEM (self), i, sim);
} else if (sim != NULL && !is_available) {
@@ -3185,7 +3187,9 @@ cinterion_slot_availability_init_ready (MMBaseModem *_self,
is_available = g_array_index (available, gboolean, i);
if (is_available)
sim = mm_base_sim_new_initialized (MM_BASE_MODEM (self), i + 1, FALSE,
sim = mm_base_sim_new_initialized (MM_BASE_MODEM (self),
G_OBJECT (self),
i + 1, FALSE,
NULL, NULL, NULL, NULL, NULL, NULL);
g_ptr_array_add (ctx->sim_slots, sim);
}
src/plugins/cinterion/mm-shared-cinterion.c
+1
View File
@@ -1006,6 +1006,7 @@ mm_shared_cinterion_create_call (MMIfaceModemVoice *self,
if (priv->slcc_support == FEATURE_SUPPORTED) {
mm_obj_dbg (self, "created new call with ^SLCC support");
return mm_base_call_new (MM_BASE_MODEM (self),
G_OBJECT (self),
direction,
number,
/* When SLCC is supported we have support for detailed
src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
+2
View File
@@ -20,6 +20,7 @@
#include "mm-base-modem-at.h"
#include "mm-iface-modem-3gpp.h"
#include "mm-log.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerFibocomEcm, mm_broadband_bearer_fibocom_ecm, MM_TYPE_BROADBAND_BEARER)
@@ -513,6 +514,7 @@ mm_broadband_bearer_fibocom_ecm_new (MMBroadbandModemFibocom *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/huawei/mm-broadband-bearer-huawei.c
+2
View File
@@ -31,6 +31,7 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-huawei.h"
#include "mm-daemon-enums-types.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerHuawei, mm_broadband_bearer_huawei, MM_TYPE_BROADBAND_BEARER)
@@ -841,6 +842,7 @@ mm_broadband_bearer_huawei_new (MMBroadbandModemHuawei *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/huawei/mm-broadband-modem-huawei.c
+1
View File
@@ -3881,6 +3881,7 @@ create_call (MMIfaceModemVoice *self,
const gchar *number)
{
return mm_base_call_new (MM_BASE_MODEM (self),
G_OBJECT (self),
direction,
number,
TRUE, /* skip_incoming_timeout */
src/plugins/huawei/mm-sim-huawei.c
+2
View File
@@ -27,6 +27,7 @@
#include <libmm-glib.h>
#include "mm-modem-helpers.h"
#include "mm-base-modem-at.h"
#include "mm-bind.h"
#include "mm-sim-huawei.h"
@@ -148,6 +149,7 @@ mm_sim_huawei_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/icera/mm-broadband-bearer-icera.c
+2
View File
@@ -34,6 +34,7 @@
#include "mm-error-helpers.h"
#include "mm-daemon-enums-types.h"
#include "mm-modem-helpers-icera.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerIcera, mm_broadband_bearer_icera, MM_TYPE_BROADBAND_BEARER);
@@ -791,6 +792,7 @@ mm_broadband_bearer_icera_new (MMBroadbandModem *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
MM_BROADBAND_BEARER_ICERA_DEFAULT_IP_METHOD, ip_method,
NULL);
src/plugins/iridium/mm-bearer-iridium.c
+2
View File
@@ -26,6 +26,7 @@
#include "mm-bearer-iridium.h"
#include "mm-base-modem-at.h"
#include "mm-bind.h"
/* Allow up to 200s to get a proper IP connection */
#define BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200
@@ -234,6 +235,7 @@ mm_bearer_iridium_new (MMBroadbandModemIridium *modem,
* g_object_get() here */
bearer = g_object_new (MM_TYPE_BEARER_IRIDIUM,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
"ip-timeout", BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT,
NULL);
src/plugins/iridium/mm-sim-iridium.c
+2
View File
@@ -25,6 +25,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-bind.h"
#include "mm-sim-iridium.h"
G_DEFINE_TYPE (MMSimIridium, mm_sim_iridium, MM_TYPE_BASE_SIM)
@@ -63,6 +64,7 @@ mm_sim_iridium_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/mbm/mm-broadband-bearer-mbm.c
+2
View File
@@ -42,6 +42,7 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-mbm.h"
#include "mm-daemon-enums-types.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerMbm, mm_broadband_bearer_mbm, MM_TYPE_BROADBAND_BEARER)
@@ -871,6 +872,7 @@ mm_broadband_bearer_mbm_new (MMBroadbandModemMbm *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/mbm/mm-sim-mbm.c
+2
View File
@@ -27,6 +27,7 @@
#include "mm-log-object.h"
#include "mm-base-modem-at.h"
#include "mm-sim-mbm.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMSimMbm, mm_sim_mbm, MM_TYPE_BASE_SIM)
@@ -221,6 +222,7 @@ mm_sim_mbm_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/mtk/mm-bearer-mbim-mtk-fibocom.c
+2
View File
@@ -21,6 +21,7 @@
#include "mm-log-object.h"
#include "mm-bearer-mbim-mtk-fibocom.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBearerMbimMtkFibocom, mm_bearer_mbim_mtk_fibocom, MM_TYPE_BEARER_MBIM)
@@ -151,6 +152,7 @@ mm_bearer_mbim_mtk_fibocom_new (MMBroadbandModemMbim *modem,
* g_object_new() here */
self = g_object_new (MM_TYPE_BEARER_MBIM_MTK_FIBOCOM,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
MM_BEARER_MBIM_ASYNC_SLAAC, is_async_slaac_supported,
NULL);
src/plugins/nokia/mm-sim-nokia.c
+2
View File
@@ -25,6 +25,7 @@
#include <libmm-glib.h>
#include "mm-sim-nokia.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMSimNokia, mm_sim_nokia, MM_TYPE_BASE_SIM)
@@ -62,6 +63,7 @@ mm_sim_nokia_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+2
View File
@@ -32,6 +32,7 @@
#include "mm-broadband-bearer-novatel-lte.h"
#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-bind.h"
#define QMISTATUS_TAG "$NWQMISTATUS:"
@@ -551,6 +552,7 @@ mm_broadband_bearer_novatel_lte_new (MMBroadbandModemNovatelLte *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/novatel/mm-sim-novatel-lte.c
+2
View File
@@ -25,6 +25,7 @@
#include <libmm-glib.h>
#include "mm-modem-helpers.h"
#include "mm-base-modem-at.h"
#include "mm-bind.h"
#include "mm-sim-novatel-lte.h"
@@ -215,6 +216,7 @@ mm_sim_novatel_lte_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/option/mm-broadband-bearer-hso.c
+2
View File
@@ -33,6 +33,7 @@
#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-daemon-enums-types.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerHso, mm_broadband_bearer_hso, MM_TYPE_BROADBAND_BEARER);
@@ -779,6 +780,7 @@ mm_broadband_bearer_hso_new (MMBroadbandModemHso *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
NULL);
}
src/plugins/option/mm-sim-option.c
+2
View File
@@ -25,6 +25,7 @@
#include <libmm-glib.h>
#include "mm-sim-option.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMSimOption, mm_sim_option, MM_TYPE_BASE_SIM)
@@ -62,6 +63,7 @@ mm_sim_option_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/pantech/mm-sim-pantech.c
+2
View File
@@ -25,6 +25,7 @@
#include <libmm-glib.h>
#include "mm-sim-pantech.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMSimPantech, mm_sim_pantech, MM_TYPE_BASE_SIM)
@@ -62,6 +63,7 @@ mm_sim_pantech_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/sierra/mm-broadband-bearer-sierra.c
+2
View File
@@ -32,6 +32,7 @@
#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-sierra.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerSierra, mm_broadband_bearer_sierra, MM_TYPE_BROADBAND_BEARER);
@@ -599,6 +600,7 @@ mm_broadband_bearer_sierra_new (MMBroadbandModem *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
MM_BROADBAND_BEARER_SIERRA_IS_ICERA, is_icera,
NULL);
src/plugins/sierra/mm-sim-sierra.c
+2
View File
@@ -27,6 +27,7 @@
#include <libmm-glib.h>
#include "mm-modem-helpers.h"
#include "mm-base-modem-at.h"
#include "mm-bind.h"
#include "mm-sim-sierra.h"
@@ -139,6 +140,7 @@ mm_sim_sierra_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}
src/plugins/ublox/mm-broadband-bearer-ublox.c
+2
View File
@@ -32,6 +32,7 @@
#include "mm-ublox-enums-types.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-ublox.h"
#include "mm-bind.h"
G_DEFINE_TYPE (MMBroadbandBearerUblox, mm_broadband_bearer_ublox, MM_TYPE_BROADBAND_BEARER)
@@ -927,6 +928,7 @@ mm_broadband_bearer_ublox_new (MMBroadbandModem *modem,
callback,
user_data,
MM_BASE_BEARER_MODEM, modem,
MM_BIND_TO, modem,
MM_BASE_BEARER_CONFIG, config,
MM_BROADBAND_BEARER_UBLOX_USB_PROFILE, profile,
MM_BROADBAND_BEARER_UBLOX_NETWORKING_MODE, mode,
src/plugins/ublox/mm-broadband-modem-ublox.c
+1
View File
@@ -1506,6 +1506,7 @@ create_call (MMIfaceModemVoice *self,
const gchar *number)
{
return mm_base_call_new (MM_BASE_MODEM (self),
G_OBJECT (self),
direction,
number,
TRUE, /* skip_incoming_timeout */
src/plugins/ublox/mm-sim-ublox.c
+2
View File
@@ -26,6 +26,7 @@
#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-base-modem-at.h"
#include "mm-bind.h"
#include "mm-sim-ublox.h"
@@ -144,6 +145,7 @@ mm_sim_ublox_new (MMBaseModem *modem,
callback,
user_data,
MM_BASE_SIM_MODEM, modem,
MM_BIND_TO, G_OBJECT (modem),
"active", TRUE, /* by default always active */
NULL);
}