From df9f2d0de53027379a10fe44ed60b2130b232442 Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" Date: Sat, 10 May 2025 18:26:26 +0200 Subject: [PATCH] intel: XMM7360: Make compatible with recent binding changes Commit ec5104c9a87a ("Move log parent and connection property binding to helper") made it obligatory for MM_TYPE_BASE_BEARER and MM_TYPE_BASE_SIM derived classes to specify MM_BIND_TO property, but recently merged XMM7360 support wasn't converted before being merged. This caused XMM7360 to fail to set-up SIM D-Bus object and mmcli to throw assertions when trying to access that non-existing SIM object. Add the missing XMM7360 MM_BIND_TO properties. Signed-off-by: Maciej S. Szmigiero --- src/plugins/intel/mm-bearer-xmm7360.c | 2 ++ src/plugins/intel/mm-sim-xmm7360.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/plugins/intel/mm-bearer-xmm7360.c b/src/plugins/intel/mm-bearer-xmm7360.c index 10dd2c26..ec108274 100644 --- a/src/plugins/intel/mm-bearer-xmm7360.c +++ b/src/plugins/intel/mm-bearer-xmm7360.c @@ -26,6 +26,7 @@ #include "mm-broadband-modem-xmm7360.h" #include "mm-broadband-modem-xmm7360-rpc.h" #include "mm-port-serial-xmmrpc-xmm7360.h" +#include "mm-bind.h" G_DEFINE_TYPE (MMBearerXmm7360, mm_bearer_xmm7360, MM_TYPE_BASE_BEARER) @@ -731,6 +732,7 @@ mm_bearer_xmm7360_new (MMBroadbandModemXmm7360 *modem, * g_object_new here */ bearer = g_object_new (MM_TYPE_BEARER_XMM7360, MM_BASE_BEARER_MODEM, modem, + MM_BIND_TO, modem, MM_BASE_BEARER_CONFIG, config, NULL); diff --git a/src/plugins/intel/mm-sim-xmm7360.c b/src/plugins/intel/mm-sim-xmm7360.c index 912e66e8..a941e847 100644 --- a/src/plugins/intel/mm-sim-xmm7360.c +++ b/src/plugins/intel/mm-sim-xmm7360.c @@ -17,6 +17,7 @@ #include "mm-broadband-modem-xmm7360-rpc.h" #include "mm-log-object.h" #include "mm-sim-xmm7360.h" +#include "mm-bind.h" G_DEFINE_TYPE (MMSimXmm7360, mm_sim_xmm7360, MM_TYPE_BASE_SIM) @@ -392,6 +393,7 @@ mm_sim_xmm7360_new (MMBaseModem *modem, callback, user_data, MM_BASE_SIM_MODEM, modem, + MM_BIND_TO, modem, "active", TRUE, /* by default always active */ NULL); } @@ -413,6 +415,7 @@ mm_sim_xmm7360_new_initialized (MMBaseModem *modem, sim = MM_BASE_SIM (g_object_new (MM_TYPE_SIM_XMM7360, MM_BASE_SIM_MODEM, modem, + MM_BIND_TO, modem, MM_BASE_SIM_SLOT_NUMBER, slot_number, "active", active, "sim-type", sim_type,