aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Voegl <lvoegl@tdt.de>2023-09-15 12:59:54 +0200
committerLukas Voegl <lvoegl@tdt.de>2023-09-18 10:53:12 +0200
commit8cd1c1bdb9ba5bfe1b69b4484cc46bdd4720fdb4 (patch)
tree959258791644b9dd12dd8949c159363cf93e0ce8
parent1fc061b6a533780041de89dd70a2567a265f6080 (diff)
api,modem: new 'Physdev' property
Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
-rw-r--r--cli/mmcli-common.c51
-rw-r--r--cli/mmcli-modem.c1
-rw-r--r--cli/mmcli-output.c1
-rw-r--r--cli/mmcli-output.h1
-rw-r--r--docs/reference/libmm-glib/libmm-glib-sections.txt4
-rw-r--r--introspection/org.freedesktop.ModemManager1.Modem.xml13
-rw-r--r--libmm-glib/mm-modem.c48
-rw-r--r--libmm-glib/mm-modem.h3
-rw-r--r--src/mm-base-manager.c8
-rw-r--r--src/mm-base-modem.c26
-rw-r--r--src/mm-base-modem.h2
-rw-r--r--src/mm-broadband-modem-mbim.c2
-rw-r--r--src/mm-broadband-modem-mbim.h1
-rw-r--r--src/mm-broadband-modem-qmi.c2
-rw-r--r--src/mm-broadband-modem-qmi.h1
-rw-r--r--src/mm-broadband-modem.c2
-rw-r--r--src/mm-broadband-modem.h1
-rw-r--r--src/mm-device.c27
-rw-r--r--src/mm-device.h3
-rw-r--r--src/mm-iface-modem.c11
-rw-r--r--src/mm-plugin.c1
-rw-r--r--src/mm-plugin.h1
-rw-r--r--src/plugins/altair/mm-broadband-modem-altair-lte.c2
-rw-r--r--src/plugins/altair/mm-broadband-modem-altair-lte.h1
-rw-r--r--src/plugins/altair/mm-plugin-altair-lte.c2
-rw-r--r--src/plugins/anydata/mm-broadband-modem-anydata.c2
-rw-r--r--src/plugins/anydata/mm-broadband-modem-anydata.h1
-rw-r--r--src/plugins/anydata/mm-plugin-anydata.c3
-rw-r--r--src/plugins/broadmobi/mm-plugin-broadmobi.c3
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-cinterion.c2
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-cinterion.h1
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c2
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h1
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c2
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h1
-rw-r--r--src/plugins/cinterion/mm-plugin-cinterion.c4
-rw-r--r--src/plugins/dell/mm-plugin-dell.c10
-rw-r--r--src/plugins/dlink/mm-plugin-dlink.c3
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-fibocom.c2
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-fibocom.h1
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c2
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h1
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c2
-rw-r--r--src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h1
-rw-r--r--src/plugins/fibocom/mm-plugin-fibocom.c6
-rw-r--r--src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c2
-rw-r--r--src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h1
-rw-r--r--src/plugins/foxconn/mm-plugin-foxconn.c4
-rw-r--r--src/plugins/generic/mm-plugin-generic.c4
-rw-r--r--src/plugins/gosuncn/mm-plugin-gosuncn.c4
-rw-r--r--src/plugins/haier/mm-plugin-haier.c2
-rw-r--r--src/plugins/huawei/mm-broadband-modem-huawei.c2
-rw-r--r--src/plugins/huawei/mm-broadband-modem-huawei.h1
-rw-r--r--src/plugins/huawei/mm-plugin-huawei.c4
-rw-r--r--src/plugins/icera/mm-broadband-modem-icera.c2
-rw-r--r--src/plugins/icera/mm-broadband-modem-icera.h1
-rw-r--r--src/plugins/intel/mm-broadband-modem-mbim-intel.c2
-rw-r--r--src/plugins/intel/mm-broadband-modem-mbim-intel.h1
-rw-r--r--src/plugins/intel/mm-plugin-intel.c3
-rw-r--r--src/plugins/iridium/mm-broadband-modem-iridium.c2
-rw-r--r--src/plugins/iridium/mm-broadband-modem-iridium.h1
-rw-r--r--src/plugins/iridium/mm-plugin-iridium.c2
-rw-r--r--src/plugins/linktop/mm-broadband-modem-linktop.c2
-rw-r--r--src/plugins/linktop/mm-broadband-modem-linktop.h1
-rw-r--r--src/plugins/linktop/mm-plugin-linktop.c2
-rw-r--r--src/plugins/longcheer/mm-broadband-modem-longcheer.c2
-rw-r--r--src/plugins/longcheer/mm-broadband-modem-longcheer.h1
-rw-r--r--src/plugins/longcheer/mm-plugin-longcheer.c2
-rw-r--r--src/plugins/mbm/mm-broadband-modem-mbm.c2
-rw-r--r--src/plugins/mbm/mm-broadband-modem-mbm.h1
-rw-r--r--src/plugins/mbm/mm-plugin-mbm.c3
-rw-r--r--src/plugins/motorola/mm-broadband-modem-motorola.c2
-rw-r--r--src/plugins/motorola/mm-broadband-modem-motorola.h1
-rw-r--r--src/plugins/motorola/mm-plugin-motorola.c2
-rw-r--r--src/plugins/mtk/mm-broadband-modem-mtk.c2
-rw-r--r--src/plugins/mtk/mm-broadband-modem-mtk.h1
-rw-r--r--src/plugins/mtk/mm-plugin-mtk.c2
-rw-r--r--src/plugins/nokia/mm-broadband-modem-nokia.c2
-rw-r--r--src/plugins/nokia/mm-broadband-modem-nokia.h1
-rw-r--r--src/plugins/nokia/mm-plugin-nokia-icera.c2
-rw-r--r--src/plugins/nokia/mm-plugin-nokia.c2
-rw-r--r--src/plugins/novatel/mm-broadband-modem-novatel-lte.c2
-rw-r--r--src/plugins/novatel/mm-broadband-modem-novatel-lte.h1
-rw-r--r--src/plugins/novatel/mm-broadband-modem-novatel.c2
-rw-r--r--src/plugins/novatel/mm-broadband-modem-novatel.h1
-rw-r--r--src/plugins/novatel/mm-plugin-novatel-lte.c2
-rw-r--r--src/plugins/novatel/mm-plugin-novatel.c3
-rw-r--r--src/plugins/option/mm-broadband-modem-hso.c2
-rw-r--r--src/plugins/option/mm-broadband-modem-hso.h1
-rw-r--r--src/plugins/option/mm-broadband-modem-option.c2
-rw-r--r--src/plugins/option/mm-broadband-modem-option.h1
-rw-r--r--src/plugins/option/mm-plugin-hso.c2
-rw-r--r--src/plugins/option/mm-plugin-option.c2
-rw-r--r--src/plugins/pantech/mm-broadband-modem-pantech.c2
-rw-r--r--src/plugins/pantech/mm-broadband-modem-pantech.h1
-rw-r--r--src/plugins/pantech/mm-plugin-pantech.c3
-rw-r--r--src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c2
-rw-r--r--src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h1
-rw-r--r--src/plugins/qcom-soc/mm-plugin-qcom-soc.c2
-rw-r--r--src/plugins/quectel/mm-broadband-modem-mbim-quectel.c2
-rw-r--r--src/plugins/quectel/mm-broadband-modem-mbim-quectel.h1
-rw-r--r--src/plugins/quectel/mm-broadband-modem-qmi-quectel.c2
-rw-r--r--src/plugins/quectel/mm-broadband-modem-qmi-quectel.h1
-rw-r--r--src/plugins/quectel/mm-broadband-modem-quectel.c2
-rw-r--r--src/plugins/quectel/mm-broadband-modem-quectel.h1
-rw-r--r--src/plugins/quectel/mm-plugin-quectel.c4
-rw-r--r--src/plugins/samsung/mm-broadband-modem-samsung.c2
-rw-r--r--src/plugins/samsung/mm-broadband-modem-samsung.h1
-rw-r--r--src/plugins/samsung/mm-plugin-samsung.c2
-rw-r--r--src/plugins/sierra/mm-broadband-modem-sierra-icera.c2
-rw-r--r--src/plugins/sierra/mm-broadband-modem-sierra-icera.h1
-rw-r--r--src/plugins/sierra/mm-broadband-modem-sierra.c2
-rw-r--r--src/plugins/sierra/mm-broadband-modem-sierra.h1
-rw-r--r--src/plugins/sierra/mm-plugin-sierra-legacy.c3
-rw-r--r--src/plugins/sierra/mm-plugin-sierra.c6
-rw-r--r--src/plugins/simtech/mm-broadband-modem-qmi-simtech.c2
-rw-r--r--src/plugins/simtech/mm-broadband-modem-qmi-simtech.h1
-rw-r--r--src/plugins/simtech/mm-broadband-modem-simtech.c2
-rw-r--r--src/plugins/simtech/mm-broadband-modem-simtech.h1
-rw-r--r--src/plugins/simtech/mm-plugin-simtech.c3
-rw-r--r--src/plugins/telit/mm-broadband-modem-mbim-telit.c2
-rw-r--r--src/plugins/telit/mm-broadband-modem-mbim-telit.h1
-rw-r--r--src/plugins/telit/mm-broadband-modem-telit.c2
-rw-r--r--src/plugins/telit/mm-broadband-modem-telit.h1
-rw-r--r--src/plugins/telit/mm-plugin-telit.c4
-rw-r--r--src/plugins/thuraya/mm-broadband-modem-thuraya.c2
-rw-r--r--src/plugins/thuraya/mm-broadband-modem-thuraya.h1
-rw-r--r--src/plugins/thuraya/mm-plugin-thuraya.c2
-rw-r--r--src/plugins/tplink/mm-plugin-tplink.c3
-rw-r--r--src/plugins/ublox/mm-broadband-modem-ublox.c2
-rw-r--r--src/plugins/ublox/mm-broadband-modem-ublox.h1
-rw-r--r--src/plugins/ublox/mm-plugin-ublox.c2
-rw-r--r--src/plugins/via/mm-broadband-modem-via.c2
-rw-r--r--src/plugins/via/mm-broadband-modem-via.h1
-rw-r--r--src/plugins/via/mm-plugin-via.c2
-rw-r--r--src/plugins/wavecom/mm-broadband-modem-wavecom.c2
-rw-r--r--src/plugins/wavecom/mm-broadband-modem-wavecom.h1
-rw-r--r--src/plugins/wavecom/mm-plugin-wavecom.c2
-rw-r--r--src/plugins/x22x/mm-broadband-modem-x22x.c2
-rw-r--r--src/plugins/x22x/mm-broadband-modem-x22x.h1
-rw-r--r--src/plugins/x22x/mm-plugin-x22x.c3
-rw-r--r--src/plugins/xmm/mm-broadband-modem-mbim-xmm.c2
-rw-r--r--src/plugins/xmm/mm-broadband-modem-mbim-xmm.h1
-rw-r--r--src/plugins/xmm/mm-broadband-modem-xmm.c2
-rw-r--r--src/plugins/xmm/mm-broadband-modem-xmm.h1
-rw-r--r--src/plugins/zte/mm-broadband-modem-zte-icera.c2
-rw-r--r--src/plugins/zte/mm-broadband-modem-zte-icera.h1
-rw-r--r--src/plugins/zte/mm-broadband-modem-zte.c1
-rw-r--r--src/plugins/zte/mm-broadband-modem-zte.h1
-rw-r--r--src/plugins/zte/mm-plugin-zte.c5
150 files changed, 446 insertions, 19 deletions
diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c
index 4163f42f..40474932 100644
--- a/cli/mmcli-common.c
+++ b/cli/mmcli-common.c
@@ -121,6 +121,7 @@ get_object_lookup_info (const gchar *str,
const gchar *object_prefix,
gchar **object_path,
gchar **modem_uid,
+ gchar **modem_physdev,
gboolean *find_any)
{
gboolean all_numeric;
@@ -132,16 +133,19 @@ get_object_lookup_info (const gchar *str,
exit (EXIT_FAILURE);
}
- /* User string may come in four ways:
+ /* User string may come in five ways:
* a) full DBus path
* b) object index
* c) modem UID (for modem or SIM lookup only)
- * d) "any" string (for modem or SIM lookup only)
+ * c) modem physdev path (for modem lookup only)
+ * e) "any" string (for modem or SIM lookup only)
*/
*object_path = NULL;
if (modem_uid)
*modem_uid = NULL;
+ if (modem_physdev)
+ *modem_physdev = NULL;
if (find_any)
*find_any = FALSE;
@@ -174,6 +178,13 @@ get_object_lookup_info (const gchar *str,
return;
}
+ /* If starts with / we have the physdev path */
+ if (g_str_has_prefix (str, "/")) {
+ g_debug ("Assuming '%s' is the %s physdev path", str, object_type);
+ *modem_physdev = g_strdup (str);
+ return;
+ }
+
/* Otherwise we have the UID */
if (modem_uid) {
g_debug ("Assuming '%s' is the modem UID", str);
@@ -193,6 +204,7 @@ static MMObject *
find_modem (MMManager *manager,
const gchar *modem_path,
const gchar *modem_uid,
+ const gchar *modem_physdev,
gboolean modem_any)
{
GList *modems;
@@ -211,7 +223,8 @@ find_modem (MMManager *manager,
if (modem_any ||
(modem_path && g_str_equal (mm_object_get_path (obj), modem_path)) ||
- (modem_uid && g_str_equal (mm_modem_get_device (modem), modem_uid))) {
+ (modem_uid && g_str_equal (mm_modem_get_device (modem), modem_uid)) ||
+ (modem_physdev && g_str_equal (mm_modem_get_physdev (modem), modem_physdev))) {
found = g_object_ref (obj);
break;
}
@@ -231,6 +244,7 @@ find_modem (MMManager *manager,
typedef struct {
gchar *modem_path;
gchar *modem_uid;
+ gchar *modem_physdev;
gboolean modem_any;
} GetModemContext;
@@ -252,6 +266,7 @@ get_modem_context_free (GetModemContext *ctx)
{
g_free (ctx->modem_path);
g_free (ctx->modem_uid);
+ g_free (ctx->modem_physdev);
g_free (ctx);
}
@@ -283,7 +298,7 @@ get_manager_ready (GDBusConnection *connection,
results = g_new (GetModemResults, 1);
results->manager = mmcli_get_manager_finish (res);
- results->object = find_modem (results->manager, ctx->modem_path, ctx->modem_uid, ctx->modem_any);
+ results->object = find_modem (results->manager, ctx->modem_path, ctx->modem_uid, ctx->modem_physdev, ctx->modem_any);
g_task_return_pointer (task, results, (GDestroyNotify)get_modem_results_free);
g_object_unref (task);
}
@@ -302,8 +317,8 @@ mmcli_get_modem (GDBusConnection *connection,
ctx = g_new0 (GetModemContext, 1);
get_object_lookup_info (str, "modem", MM_DBUS_MODEM_PREFIX,
- &ctx->modem_path, &ctx->modem_uid, &ctx->modem_any);
- g_assert (!!ctx->modem_path + !!ctx->modem_uid + ctx->modem_any == 1);
+ &ctx->modem_path, &ctx->modem_uid, &ctx->modem_physdev, &ctx->modem_any);
+ g_assert (!!ctx->modem_path + !!ctx->modem_uid + !!ctx->modem_physdev + ctx->modem_any == 1);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_modem_context_free);
mmcli_get_manager (connection,
@@ -321,13 +336,14 @@ mmcli_get_modem_sync (GDBusConnection *connection,
MMObject *found;
gchar *modem_path = NULL;
gchar *modem_uid = NULL;
+ gchar *modem_physdev = NULL;
gboolean modem_any = FALSE;
manager = mmcli_get_manager_sync (connection);
get_object_lookup_info (str, "modem", MM_DBUS_MODEM_PREFIX,
- &modem_path, &modem_uid, &modem_any);
- g_assert (!!modem_path + !!modem_uid + modem_any == 1);
- found = find_modem (manager, modem_path, modem_uid, modem_any);
+ &modem_path, &modem_uid, &modem_physdev, &modem_any);
+ g_assert (!!modem_path + !!modem_uid + !!modem_physdev + modem_any == 1);
+ found = find_modem (manager, modem_path, modem_uid, modem_physdev, modem_any);
if (o_manager)
*o_manager = manager;
@@ -335,6 +351,7 @@ mmcli_get_modem_sync (GDBusConnection *connection,
g_object_unref (manager);
g_free (modem_path);
g_free (modem_uid);
+ g_free (modem_physdev);
return found;
}
@@ -592,7 +609,7 @@ mmcli_get_bearer (GDBusConnection *connection,
ctx = g_new0 (GetBearerContext, 1);
get_object_lookup_info (str, "bearer", MM_DBUS_BEARER_PREFIX,
- &ctx->bearer_path, NULL, NULL);
+ &ctx->bearer_path, NULL, NULL, NULL);
g_assert (ctx->bearer_path);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_bearer_context_free);
@@ -615,7 +632,7 @@ mmcli_get_bearer_sync (GDBusConnection *connection,
gchar *bearer_path = NULL;
get_object_lookup_info (str, "bearer", MM_DBUS_BEARER_PREFIX,
- &bearer_path, NULL, NULL);
+ &bearer_path, NULL, NULL, NULL);
g_assert (bearer_path);
manager = mmcli_get_manager_sync (connection);
@@ -915,7 +932,7 @@ mmcli_get_sim (GDBusConnection *connection,
ctx = g_new0 (GetSimContext, 1);
get_object_lookup_info (str, "SIM", MM_DBUS_SIM_PREFIX,
- &ctx->sim_path, &ctx->modem_uid, &ctx->sim_any);
+ &ctx->sim_path, &ctx->modem_uid, NULL, &ctx->sim_any);
g_assert (!!ctx->sim_path + !!ctx->modem_uid + ctx->sim_any == 1);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_sim_context_free);
@@ -940,7 +957,7 @@ mmcli_get_sim_sync (GDBusConnection *connection,
gboolean sim_any = FALSE;
get_object_lookup_info (str, "SIM", MM_DBUS_SIM_PREFIX,
- &sim_path, &modem_uid, &sim_any);
+ &sim_path, &modem_uid, NULL, &sim_any);
g_assert (!!sim_path + !!modem_uid + sim_any == 1);
manager = mmcli_get_manager_sync (connection);
@@ -1222,7 +1239,7 @@ mmcli_get_sms (GDBusConnection *connection,
ctx = g_new0 (GetSmsContext, 1);
get_object_lookup_info (str, "SMS", MM_DBUS_SMS_PREFIX,
- &ctx->sms_path, NULL, NULL);
+ &ctx->sms_path, NULL, NULL, NULL);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_sms_context_free);
mmcli_get_manager (connection,
@@ -1244,7 +1261,7 @@ mmcli_get_sms_sync (GDBusConnection *connection,
gchar *sms_path = NULL;
get_object_lookup_info (str, "SMS", MM_DBUS_SMS_PREFIX,
- &sms_path, NULL, NULL);
+ &sms_path, NULL, NULL, NULL);
manager = mmcli_get_manager_sync (connection);
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (manager));
@@ -1485,7 +1502,7 @@ mmcli_get_call (GDBusConnection *connection,
ctx = g_new0 (GetCallContext, 1);
get_object_lookup_info (str, "call", MM_DBUS_CALL_PREFIX,
- &ctx->call_path, NULL, NULL);
+ &ctx->call_path, NULL, NULL, NULL);
g_task_set_task_data (task, ctx, (GDestroyNotify) get_call_context_free);
mmcli_get_manager (connection,
@@ -1507,7 +1524,7 @@ mmcli_get_call_sync (GDBusConnection *connection,
gchar *call_path = NULL;
get_object_lookup_info (str, "call", MM_DBUS_CALL_PREFIX,
- &call_path, NULL, NULL);
+ &call_path, NULL, NULL, NULL);
manager = mmcli_get_manager_sync (connection);
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (manager));
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
index 54ed3414..1375c7b4 100644
--- a/cli/mmcli-modem.c
+++ b/cli/mmcli-modem.c
@@ -371,6 +371,7 @@ print_modem_info (void)
mmcli_output_string (MMC_F_HARDWARE_EQUIPMENT_ID, mm_modem_get_equipment_identifier (ctx->modem));
mmcli_output_string (MMC_F_SYSTEM_DEVICE, mm_modem_get_device (ctx->modem));
+ mmcli_output_string (MMC_F_SYSTEM_PHYSDEV, mm_modem_get_physdev (ctx->modem));
mmcli_output_string_array (MMC_F_SYSTEM_DRIVERS, (const gchar **) mm_modem_get_drivers (ctx->modem), FALSE);
mmcli_output_string (MMC_F_SYSTEM_PLUGIN, mm_modem_get_plugin (ctx->modem));
mmcli_output_string (MMC_F_SYSTEM_PRIMARY_PORT, mm_modem_get_primary_port (ctx->modem));
diff --git a/cli/mmcli-output.c b/cli/mmcli-output.c
index 8c5cf218..151778ef 100644
--- a/cli/mmcli-output.c
+++ b/cli/mmcli-output.c
@@ -111,6 +111,7 @@ static FieldInfo field_infos[] = {
[MMC_F_HARDWARE_CURRENT_CAPABILITIES] = { "modem.generic.current-capabilities", "current", MMC_S_MODEM_HARDWARE, },
[MMC_F_HARDWARE_EQUIPMENT_ID] = { "modem.generic.equipment-identifier", "equipment id", MMC_S_MODEM_HARDWARE, },
[MMC_F_SYSTEM_DEVICE] = { "modem.generic.device", "device", MMC_S_MODEM_SYSTEM, },
+ [MMC_F_SYSTEM_PHYSDEV] = { "modem.generic.physdev", "physdev", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_DRIVERS] = { "modem.generic.drivers", "drivers", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_PLUGIN] = { "modem.generic.plugin", "plugin", MMC_S_MODEM_SYSTEM, },
[MMC_F_SYSTEM_PRIMARY_PORT] = { "modem.generic.primary-port", "primary port", MMC_S_MODEM_SYSTEM, },
diff --git a/cli/mmcli-output.h b/cli/mmcli-output.h
index 77c75a67..5e2a3071 100644
--- a/cli/mmcli-output.h
+++ b/cli/mmcli-output.h
@@ -105,6 +105,7 @@ typedef enum {
MMC_F_HARDWARE_EQUIPMENT_ID,
/* System section */
MMC_F_SYSTEM_DEVICE,
+ MMC_F_SYSTEM_PHYSDEV,
MMC_F_SYSTEM_DRIVERS,
MMC_F_SYSTEM_PLUGIN,
MMC_F_SYSTEM_PRIMARY_PORT,
diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt
index ed2373cf..e4eda2f9 100644
--- a/docs/reference/libmm-glib/libmm-glib-sections.txt
+++ b/docs/reference/libmm-glib/libmm-glib-sections.txt
@@ -157,6 +157,8 @@ mm_modem_peek_ports
mm_modem_get_ports
mm_modem_get_device
mm_modem_dup_device
+mm_modem_get_physdev
+mm_modem_dup_physdev
mm_modem_get_equipment_identifier
mm_modem_dup_equipment_identifier
mm_modem_get_device_identifier
@@ -2679,6 +2681,8 @@ mm_gdbus_modem_dup_current_bands
mm_gdbus_modem_get_current_capabilities
mm_gdbus_modem_get_device
mm_gdbus_modem_dup_device
+mm_gdbus_modem_get_physdev
+mm_gdbus_modem_dup_physdev
mm_gdbus_modem_get_device_identifier
mm_gdbus_modem_dup_device_identifier
mm_gdbus_modem_get_drivers
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.xml b/introspection/org.freedesktop.ModemManager1.Modem.xml
index f68cac05..6631d85c 100644
--- a/introspection/org.freedesktop.ModemManager1.Modem.xml
+++ b/introspection/org.freedesktop.ModemManager1.Modem.xml
@@ -930,6 +930,19 @@
<property name="Device" type="s" access="read" />
<!--
+ Physdev:
+
+ The physical modem device path (ie, USB, PCI, PCMCIA device), which
+ may be dependent upon the operating system.
+
+ In Linux for example, this points to a sysfs path of the usb_device
+ object.
+
+ Since: 1.22
+ -->
+ <property name="Physdev" type="s" access="read" />
+
+ <!--
Drivers:
The Operating System device drivers handling communication with the modem
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index 8e1a80f2..bf684eda 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -776,6 +776,54 @@ mm_modem_dup_device (MMModem *self)
/*****************************************************************************/
/**
+ * mm_modem_get_physdev:
+ * @self: A #MMModem.
+ *
+ * Gets the physical modem device path (ie, USB, PCI, PCMCIA device), which
+ * may be dependent upon the operating system.
+ *
+ * <warning>The returned value is only valid until the property changes so it is
+ * only safe to use this function on the thread where @self was constructed. Use
+ * mm_modem_dup_physdev() if on another thread.</warning>
+ *
+ * Returns: (transfer none): The physdev path, or %NULL if none available. Do not
+ * free the returned value, it belongs to @self.
+ *
+ * Since: 1.22
+ */
+const gchar *
+mm_modem_get_physdev (MMModem *self)
+{
+ g_return_val_if_fail (MM_IS_MODEM (self), NULL);
+
+ RETURN_NON_EMPTY_CONSTANT_STRING (
+ mm_gdbus_modem_get_physdev (MM_GDBUS_MODEM (self)));
+}
+
+/**
+ * mm_modem_dup_physdev:
+ * @self: A #MMModem.
+ *
+ * Gets a copy of the physical modem device path (ie, USB, PCI, PCMCIA
+ * device), which may be dependent upon the operating system.
+ *
+ * Returns: (transfer full): The physdev path, or %NULL if none available. The
+ * returned value should be freed with g_free().
+ *
+ * Since: 1.22
+ */
+gchar *
+mm_modem_dup_physdev (MMModem *self)
+{
+ g_return_val_if_fail (MM_IS_MODEM (self), NULL);
+
+ RETURN_NON_EMPTY_STRING (
+ mm_gdbus_modem_dup_physdev (MM_GDBUS_MODEM (self)));
+}
+
+/*****************************************************************************/
+
+/**
* mm_modem_get_drivers:
* @self: A #MMModem.
*
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index 9d1a7333..d59f09a1 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -119,6 +119,9 @@ gchar *mm_modem_dup_device_identifier (MMModem *self);
const gchar *mm_modem_get_device (MMModem *self);
gchar *mm_modem_dup_device (MMModem *self);
+const gchar *mm_modem_get_physdev (MMModem *self);
+gchar *mm_modem_dup_physdev (MMModem *self);
+
const gchar * const *mm_modem_get_drivers (MMModem *self);
gchar **mm_modem_dup_drivers (MMModem *self);
diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c
index 75620ca0..dbea02f6 100644
--- a/src/mm-base-manager.c
+++ b/src/mm-base-manager.c
@@ -355,12 +355,15 @@ device_added (MMBaseManager *self,
/* See if we already created an object to handle ports in this device */
device = find_device_by_physdev_uid (self, physdev_uid);
if (!device) {
+ const gchar *physdev;
FindDeviceSupportContext *ctx;
mm_obj_dbg (self, "port %s is first in device %s", name, physdev_uid);
+ physdev = mm_kernel_device_get_physdev_sysfs_path (port);
+
/* Keep the device listed in the Manager */
- device = mm_device_new (physdev_uid, hotplugged, FALSE, self->priv->object_manager);
+ device = mm_device_new (physdev_uid, physdev, hotplugged, FALSE, self->priv->object_manager);
g_hash_table_insert (self->priv->devices,
g_strdup (physdev_uid),
device);
@@ -1366,13 +1369,14 @@ handle_set_profile (MmGdbusTest *skeleton,
MMPlugin *plugin;
MMDevice *device;
gchar *physdev_uid;
+ gchar *physdev = NULL;
GError *error = NULL;
mm_obj_msg (self, "test profile set to: '%s'", id);
/* Create device and keep it listed in the Manager */
physdev_uid = g_strdup_printf ("/virtual/%s", id);
- device = mm_device_new (physdev_uid, TRUE, TRUE, self->priv->object_manager);
+ device = mm_device_new (physdev_uid, physdev, TRUE, TRUE, self->priv->object_manager);
g_hash_table_insert (self->priv->devices, physdev_uid, device);
/* Grab virtual ports */
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index f5a983c0..e02be984 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -53,6 +53,7 @@ enum {
PROP_VALID,
PROP_MAX_TIMEOUTS,
PROP_DEVICE,
+ PROP_PHYSDEV,
PROP_DRIVERS,
PROP_PLUGIN,
PROP_VENDOR_ID,
@@ -85,6 +86,7 @@ struct _MMBaseModemPrivate {
gulong invalid_if_cancelled;
gchar *device;
+ gchar *physdev;
gchar **drivers;
gchar *plugin;
@@ -1723,6 +1725,14 @@ mm_base_modem_get_device (MMBaseModem *self)
return self->priv->device;
}
+const gchar *
+mm_base_modem_get_physdev (MMBaseModem *self)
+{
+ g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
+
+ return self->priv->physdev;
+}
+
const gchar **
mm_base_modem_get_drivers (MMBaseModem *self)
{
@@ -1908,6 +1918,10 @@ set_property (GObject *object,
g_free (self->priv->device);
self->priv->device = g_value_dup_string (value);
break;
+ case PROP_PHYSDEV:
+ g_free (self->priv->physdev);
+ self->priv->physdev = g_value_dup_string (value);
+ break;
case PROP_DRIVERS:
g_strfreev (self->priv->drivers);
self->priv->drivers = g_value_dup_boxed (value);
@@ -1962,6 +1976,9 @@ get_property (GObject *object,
case PROP_DEVICE:
g_value_set_string (value, self->priv->device);
break;
+ case PROP_PHYSDEV:
+ g_value_set_string (value, self->priv->physdev);
+ break;
case PROP_DRIVERS:
g_value_set_boxed (value, self->priv->drivers);
break;
@@ -2007,6 +2024,7 @@ finalize (GObject *object)
mm_obj_dbg (self, "completely disposed");
g_free (self->priv->device);
+ g_free (self->priv->physdev);
g_strfreev (self->priv->drivers);
g_free (self->priv->plugin);
@@ -2098,6 +2116,14 @@ mm_base_modem_class_init (MMBaseModemClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_DEVICE, properties[PROP_DEVICE]);
+ properties[PROP_PHYSDEV] =
+ g_param_spec_string (MM_BASE_MODEM_PHYSDEV,
+ "Physdev path",
+ "Main modem parent physical device path",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (object_class, PROP_PHYSDEV, properties[PROP_PHYSDEV]);
+
properties[PROP_DRIVERS] =
g_param_spec_boxed (MM_BASE_MODEM_DRIVERS,
"Drivers",
diff --git a/src/mm-base-modem.h b/src/mm-base-modem.h
index eae59e7f..32343fac 100644
--- a/src/mm-base-modem.h
+++ b/src/mm-base-modem.h
@@ -59,6 +59,7 @@ typedef struct _MMBaseModemPrivate MMBaseModemPrivate;
#define MM_BASE_MODEM_MAX_TIMEOUTS "base-modem-max-timeouts"
#define MM_BASE_MODEM_VALID "base-modem-valid"
#define MM_BASE_MODEM_DEVICE "base-modem-device"
+#define MM_BASE_MODEM_PHYSDEV "base-modem-physdev-path"
#define MM_BASE_MODEM_DRIVERS "base-modem-drivers"
#define MM_BASE_MODEM_PLUGIN "base-modem-plugin"
#define MM_BASE_MODEM_VENDOR_ID "base-modem-vendor-id"
@@ -205,6 +206,7 @@ void mm_base_modem_set_reprobe (MMBaseModem *self,
gboolean mm_base_modem_get_reprobe (MMBaseModem *self);
const gchar *mm_base_modem_get_device (MMBaseModem *self);
+const gchar *mm_base_modem_get_physdev (MMBaseModem *self);
const gchar **mm_base_modem_get_drivers (MMBaseModem *self);
const gchar *mm_base_modem_get_plugin (MMBaseModem *self);
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 0c6598ae..c6682968 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -9731,6 +9731,7 @@ modem_set_carrier_lock (MMIfaceModem3gpp *_self,
MMBroadbandModemMbim *
mm_broadband_modem_mbim_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -9738,6 +9739,7 @@ mm_broadband_modem_mbim_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/mm-broadband-modem-mbim.h b/src/mm-broadband-modem-mbim.h
index c6c7bae9..8953ef8a 100644
--- a/src/mm-broadband-modem-mbim.h
+++ b/src/mm-broadband-modem-mbim.h
@@ -49,6 +49,7 @@ GType mm_broadband_modem_mbim_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModemMbim, g_object_unref)
MMBroadbandModemMbim *mm_broadband_modem_mbim_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 153b420e..265f6d5a 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -13581,6 +13581,7 @@ initialization_started (MMBroadbandModem *self,
MMBroadbandModemQmi *
mm_broadband_modem_qmi_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -13588,6 +13589,7 @@ mm_broadband_modem_qmi_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/mm-broadband-modem-qmi.h b/src/mm-broadband-modem-qmi.h
index e324d793..97a1a772 100644
--- a/src/mm-broadband-modem-qmi.h
+++ b/src/mm-broadband-modem-qmi.h
@@ -47,6 +47,7 @@ GType mm_broadband_modem_qmi_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModemQmi, g_object_unref)
MMBroadbandModemQmi *mm_broadband_modem_qmi_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 01a73ba6..10a67ea3 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -12958,6 +12958,7 @@ mm_broadband_modem_create_device_identifier (MMBroadbandModem *self,
MMBroadbandModem *
mm_broadband_modem_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -12965,6 +12966,7 @@ mm_broadband_modem_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/mm-broadband-modem.h b/src/mm-broadband-modem.h
index e6463de6..e1c7cdfd 100644
--- a/src/mm-broadband-modem.h
+++ b/src/mm-broadband-modem.h
@@ -103,6 +103,7 @@ GType mm_broadband_modem_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModem, g_object_unref)
MMBroadbandModem *mm_broadband_modem_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/mm-device.c b/src/mm-device.c
index 83b1ed16..c2705f5e 100644
--- a/src/mm-device.c
+++ b/src/mm-device.c
@@ -35,6 +35,7 @@ G_DEFINE_TYPE_EXTENDED (MMDevice, mm_device, G_TYPE_OBJECT, 0,
enum {
PROP_0,
PROP_UID,
+ PROP_PHYSDEV,
PROP_OBJECT_MANAGER,
PROP_PLUGIN,
PROP_MODEM,
@@ -60,6 +61,9 @@ struct _MMDevicePrivate {
/* Unique id */
gchar *uid;
+ /* Physdev path */
+ gchar *physdev;
+
/* The object manager */
GDBusObjectManagerServer *object_manager;
@@ -526,6 +530,12 @@ mm_device_get_uid (MMDevice *self)
return self->priv->uid;
}
+const gchar *
+mm_device_get_physdev (MMDevice *self)
+{
+ return self->priv->physdev;
+}
+
const gchar **
mm_device_get_drivers (MMDevice *self)
{
@@ -756,6 +766,7 @@ log_object_build_id (MMLogObject *_self)
MMDevice *
mm_device_new (const gchar *uid,
+ const gchar *physdev,
gboolean hotplugged,
gboolean virtual,
GDBusObjectManagerServer *object_manager)
@@ -764,6 +775,7 @@ mm_device_new (const gchar *uid,
return MM_DEVICE (g_object_new (MM_TYPE_DEVICE,
MM_DEVICE_UID, uid,
+ MM_DEVICE_PHYSDEV, physdev,
MM_DEVICE_HOTPLUGGED, hotplugged,
MM_DEVICE_VIRTUAL, virtual,
MM_DEVICE_OBJECT_MANAGER, object_manager,
@@ -790,6 +802,10 @@ set_property (GObject *object,
/* construct only */
self->priv->uid = g_value_dup_string (value);
break;
+ case PROP_PHYSDEV:
+ /* construct only */
+ self->priv->physdev = g_value_dup_string (value);
+ break;
case PROP_OBJECT_MANAGER:
/* construct only */
self->priv->object_manager = g_value_dup_object (value);
@@ -829,6 +845,9 @@ get_property (GObject *object,
case PROP_UID:
g_value_set_string (value, self->priv->uid);
break;
+ case PROP_PHYSDEV:
+ g_value_set_object (value, self->priv->physdev);
+ break;
case PROP_OBJECT_MANAGER:
g_value_set_object (value, self->priv->object_manager);
break;
@@ -913,6 +932,14 @@ mm_device_class_init (MMDeviceClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_UID, properties[PROP_UID]);
+ properties[PROP_PHYSDEV] =
+ g_param_spec_string (MM_DEVICE_PHYSDEV,
+ "Physdev",
+ "Physical device path",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (object_class, PROP_PHYSDEV, properties[PROP_PHYSDEV]);
+
properties[PROP_OBJECT_MANAGER] =
g_param_spec_object (MM_DEVICE_OBJECT_MANAGER,
"Object manager",
diff --git a/src/mm-device.h b/src/mm-device.h
index 812c03a6..9c835024 100644
--- a/src/mm-device.h
+++ b/src/mm-device.h
@@ -34,6 +34,7 @@ typedef struct _MMDeviceClass MMDeviceClass;
typedef struct _MMDevicePrivate MMDevicePrivate;
#define MM_DEVICE_UID "uid"
+#define MM_DEVICE_PHYSDEV "physdev"
#define MM_DEVICE_PLUGIN "plugin"
#define MM_DEVICE_MODEM "modem"
#define MM_DEVICE_HOTPLUGGED "hotplugged"
@@ -63,6 +64,7 @@ GType mm_device_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMDevice, g_object_unref)
MMDevice *mm_device_new (const gchar *uid,
+ const gchar *physdev,
gboolean hotplugged,
gboolean virtual,
GDBusObjectManagerServer *object_manager);
@@ -96,6 +98,7 @@ gboolean mm_device_uninhibit (MMDevice *self,
const gchar *mm_device_get_uid (MMDevice *self);
+const gchar *mm_device_get_physdev (MMDevice *self);
const gchar **mm_device_get_drivers (MMDevice *self);
guint16 mm_device_get_vendor (MMDevice *self);
guint16 mm_device_get_product (MMDevice *self);
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 3fa53c77..7940a2d6 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -5332,6 +5332,16 @@ interface_initialization_step (GTask *task)
mm_gdbus_modem_set_device (ctx->skeleton, device);
g_free (device);
}
+ /* Load physdev path if not done before */
+ if (!mm_gdbus_modem_get_physdev (ctx->skeleton)) {
+ gchar *physdev;
+
+ g_object_get (self,
+ MM_BASE_MODEM_PHYSDEV, &physdev,
+ NULL);
+ mm_gdbus_modem_set_physdev (ctx->skeleton, physdev);
+ g_free (physdev);
+ }
/* Load driver if not done before */
if (!mm_gdbus_modem_get_drivers (ctx->skeleton)) {
gchar **drivers;
@@ -6035,6 +6045,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
mm_gdbus_modem_set_own_numbers (skeleton, NULL);
mm_gdbus_modem_set_device_identifier (skeleton, NULL);
mm_gdbus_modem_set_device (skeleton, NULL);
+ mm_gdbus_modem_set_physdev (skeleton, NULL);
mm_gdbus_modem_set_drivers (skeleton, NULL);
mm_gdbus_modem_set_plugin (skeleton, NULL);
mm_gdbus_modem_set_equipment_identifier (skeleton, NULL);
diff --git a/src/mm-plugin.c b/src/mm-plugin.c
index 464e3fd7..55e1363e 100644
--- a/src/mm-plugin.c
+++ b/src/mm-plugin.c
@@ -947,6 +947,7 @@ mm_plugin_create_modem (MMPlugin *self,
/* Let the plugin create the modem from the port probe results */
modem = MM_PLUGIN_GET_CLASS (self)->create_modem (MM_PLUGIN (self),
mm_device_get_uid (device),
+ mm_device_get_physdev (device),
drivers,
mm_device_get_vendor (device),
mm_device_get_product (device),
diff --git a/src/mm-plugin.h b/src/mm-plugin.h
index 89170167..79a703b1 100644
--- a/src/mm-plugin.h
+++ b/src/mm-plugin.h
@@ -105,6 +105,7 @@ struct _MMPluginClass {
* a list of port probes (Mandatory) */
MMBaseModem *(*create_modem) (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
diff --git a/src/plugins/altair/mm-broadband-modem-altair-lte.c b/src/plugins/altair/mm-broadband-modem-altair-lte.c
index 837d57cc..98fb6076 100644
--- a/src/plugins/altair/mm-broadband-modem-altair-lte.c
+++ b/src/plugins/altair/mm-broadband-modem-altair-lte.c
@@ -1156,6 +1156,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemAltairLte *
mm_broadband_modem_altair_lte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1164,6 +1165,7 @@ mm_broadband_modem_altair_lte_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_ALTAIR_LTE,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/altair/mm-broadband-modem-altair-lte.h b/src/plugins/altair/mm-broadband-modem-altair-lte.h
index fc8d362e..f84c4005 100644
--- a/src/plugins/altair/mm-broadband-modem-altair-lte.h
+++ b/src/plugins/altair/mm-broadband-modem-altair-lte.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemAltairLteClass{
GType mm_broadband_modem_altair_lte_get_type (void);
MMBroadbandModemAltairLte *mm_broadband_modem_altair_lte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/altair/mm-plugin-altair-lte.c b/src/plugins/altair/mm-plugin-altair-lte.c
index 6049d93b..db69688b 100644
--- a/src/plugins/altair/mm-plugin-altair-lte.c
+++ b/src/plugins/altair/mm-plugin-altair-lte.c
@@ -50,6 +50,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -58,6 +59,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_altair_lte_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/anydata/mm-broadband-modem-anydata.c b/src/plugins/anydata/mm-broadband-modem-anydata.c
index 36d72e56..e1bfae4f 100644
--- a/src/plugins/anydata/mm-broadband-modem-anydata.c
+++ b/src/plugins/anydata/mm-broadband-modem-anydata.c
@@ -308,6 +308,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemAnydata *
mm_broadband_modem_anydata_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -315,6 +316,7 @@ mm_broadband_modem_anydata_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_ANYDATA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/anydata/mm-broadband-modem-anydata.h b/src/plugins/anydata/mm-broadband-modem-anydata.h
index 94145623..85efe0a8 100644
--- a/src/plugins/anydata/mm-broadband-modem-anydata.h
+++ b/src/plugins/anydata/mm-broadband-modem-anydata.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemAnydataClass{
GType mm_broadband_modem_anydata_get_type (void);
MMBroadbandModemAnydata *mm_broadband_modem_anydata_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/anydata/mm-plugin-anydata.c b/src/plugins/anydata/mm-plugin-anydata.c
index aacd3cc1..c28f6836 100644
--- a/src/plugins/anydata/mm-plugin-anydata.c
+++ b/src/plugins/anydata/mm-plugin-anydata.c
@@ -37,6 +37,7 @@ MM_DEFINE_PLUGIN (ANYDATA, anydata, Anydata)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -48,6 +49,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered AnyDATA modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -56,6 +58,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_anydata_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/broadmobi/mm-plugin-broadmobi.c b/src/plugins/broadmobi/mm-plugin-broadmobi.c
index a7e5efef..1c90fc4f 100644
--- a/src/plugins/broadmobi/mm-plugin-broadmobi.c
+++ b/src/plugins/broadmobi/mm-plugin-broadmobi.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (BROADMOBI, broadmobi, Broadmobi)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered BroadMobi modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -54,6 +56,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index 678abce5..9612b23e 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -3116,6 +3116,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemCinterion *
mm_broadband_modem_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -3123,6 +3124,7 @@ mm_broadband_modem_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_CINTERION,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-cinterion.h
index 555ee084..597fec84 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.h
@@ -44,6 +44,7 @@ struct _MMBroadbandModemCinterionClass{
GType mm_broadband_modem_cinterion_get_type (void);
MMBroadbandModemCinterion *mm_broadband_modem_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
index 740909b1..19d34f28 100644
--- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
@@ -52,6 +52,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_c
MMBroadbandModemMbimCinterion *
mm_broadband_modem_mbim_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -59,6 +60,7 @@ mm_broadband_modem_mbim_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_CINTERION,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
index a2f2ef68..88bde480 100644
--- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimCinterionClass{
GType mm_broadband_modem_mbim_cinterion_get_type (void);
MMBroadbandModemMbimCinterion *mm_broadband_modem_mbim_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
index b94e63d3..8bd5eafc 100644
--- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
@@ -53,6 +53,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cin
MMBroadbandModemQmiCinterion *
mm_broadband_modem_qmi_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -60,6 +61,7 @@ mm_broadband_modem_qmi_cinterion_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_CINTERION,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
index ac8f68be..0794f6e8 100644
--- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
@@ -40,6 +40,7 @@ struct _MMBroadbandModemQmiCinterionClass{
GType mm_broadband_modem_qmi_cinterion_get_type (void);
MMBroadbandModemQmiCinterion *mm_broadband_modem_qmi_cinterion_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/cinterion/mm-plugin-cinterion.c b/src/plugins/cinterion/mm-plugin-cinterion.c
index f1b581f1..c07579f6 100644
--- a/src/plugins/cinterion/mm-plugin-cinterion.c
+++ b/src/plugins/cinterion/mm-plugin-cinterion.c
@@ -138,6 +138,7 @@ cinterion_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -149,6 +150,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Cinterion modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_cinterion_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -160,6 +162,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Cinterion modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_cinterion_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -168,6 +171,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_cinterion_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/dell/mm-plugin-dell.c b/src/plugins/dell/mm-plugin-dell.c
index e7f813b1..bec1e9cb 100644
--- a/src/plugins/dell/mm-plugin-dell.c
+++ b/src/plugins/dell/mm-plugin-dell.c
@@ -370,6 +370,7 @@ port_probe_list_has_manufacturer_port (GList *probes,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -385,6 +386,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -398,6 +400,7 @@ create_modem (MMPlugin *self,
if (vendor == 0x413c && (product == 0x81d7 || product == 0x81e0 || product == 0x81e4 || product == 0x81e6)) {
mm_obj_dbg (self, "MBIM-powered DW5821e/DW5829e (T77W968) modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_foxconn_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -407,6 +410,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "MBIM-powered XMM-based modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -415,6 +419,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "MBIM-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -425,6 +430,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_NOVATEL)) {
mm_obj_dbg (self, "Novatel-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_novatel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -434,6 +440,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_SIERRA)) {
mm_obj_dbg (self, "Sierra-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_sierra_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -443,6 +450,7 @@ create_modem (MMPlugin *self,
if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_TELIT)) {
mm_obj_dbg (self, "Telit-powered Dell-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_telit_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -452,6 +460,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "XMM-based modem found...");
return MM_BASE_MODEM (mm_broadband_modem_xmm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -460,6 +469,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Dell-branded generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/dlink/mm-plugin-dlink.c b/src/plugins/dlink/mm-plugin-dlink.c
index 264c608e..2d3d05ee 100644
--- a/src/plugins/dlink/mm-plugin-dlink.c
+++ b/src/plugins/dlink/mm-plugin-dlink.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (DLINK, dlink, Dlink)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered D-Link modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -54,6 +56,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
index 9d659698..901cdd7b 100644
--- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
@@ -676,6 +676,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemFibocom *
mm_broadband_modem_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -683,6 +684,7 @@ mm_broadband_modem_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-fibocom.h
index 958841b7..485721d8 100644
--- a/src/plugins/fibocom/mm-broadband-modem-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemFibocomClass{
GType mm_broadband_modem_fibocom_get_type (void);
MMBroadbandModemFibocom *mm_broadband_modem_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
index 425681d6..ac0be416 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fib
MMBroadbandModemMbimFibocom *
mm_broadband_modem_mbim_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_mbim_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
index b5c5434f..0b3603d9 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimFibocomClass{
GType mm_broadband_modem_mbim_fibocom_get_type (void);
MMBroadbandModemMbimFibocom *mm_broadband_modem_mbim_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
index 7ed39362..86f48797 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_
MMBroadbandModemMbimXmmFibocom *
mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_XMM_FIBOCOM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
index db51cfc8..bfb0df7a 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimXmmFibocomClass{
GType mm_broadband_modem_mbim_xmm_fibocom_get_type (void);
MMBroadbandModemMbimXmmFibocom *mm_broadband_modem_mbim_xmm_fibocom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/fibocom/mm-plugin-fibocom.c b/src/plugins/fibocom/mm-plugin-fibocom.c
index f85f9911..a30575e2 100644
--- a/src/plugins/fibocom/mm-plugin-fibocom.c
+++ b/src/plugins/fibocom/mm-plugin-fibocom.c
@@ -44,6 +44,7 @@ MM_DEFINE_PLUGIN (FIBOCOM, fibocom, Fibocom)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "MBIM-powered XMM-based Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_fibocom_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -63,6 +65,7 @@ create_modem (MMPlugin *self,
}
mm_obj_dbg (self, "MBIM-powered Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_fibocom_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -74,6 +77,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -84,6 +88,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "XMM-based Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_xmm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -92,6 +97,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Fibocom modem found...");
return MM_BASE_MODEM (mm_broadband_modem_fibocom_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
index cec1c617..51894790 100644
--- a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
+++ b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
@@ -543,6 +543,7 @@ enable_location_gathering (MMIfaceModemLocation *self,
MMBroadbandModemMbimFoxconn *
mm_broadband_modem_mbim_foxconn_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -558,6 +559,7 @@ mm_broadband_modem_mbim_foxconn_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_FOXCONN,
MM_BASE_MODEM_DEVICE, device,
MM_BASE_MODEM_DRIVERS, drivers,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
MM_BASE_MODEM_PRODUCT_ID, product_id,
diff --git a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
index 374599e4..e9535846 100644
--- a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
+++ b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemMbimFoxconnClass{
GType mm_broadband_modem_mbim_foxconn_get_type (void);
MMBroadbandModemMbimFoxconn *mm_broadband_modem_mbim_foxconn_new (const gchar *device,
+ const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/foxconn/mm-plugin-foxconn.c b/src/plugins/foxconn/mm-plugin-foxconn.c
index ecc0df2c..70da1608 100644
--- a/src/plugins/foxconn/mm-plugin-foxconn.c
+++ b/src/plugins/foxconn/mm-plugin-foxconn.c
@@ -45,6 +45,7 @@ MM_DEFINE_PLUGIN (FOXCONN, foxconn, Foxconn)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Foxconn-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -67,6 +69,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Foxconn-branded modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_foxconn_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -76,6 +79,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Foxconn-branded generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/generic/mm-plugin-generic.c b/src/plugins/generic/mm-plugin-generic.c
index 1791c924..ff982573 100644
--- a/src/plugins/generic/mm-plugin-generic.c
+++ b/src/plugins/generic/mm-plugin-generic.c
@@ -49,6 +49,7 @@ MM_DEFINE_PLUGIN (GENERIC, generic, Generic)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -60,6 +61,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -71,6 +73,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered generic modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -79,6 +82,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/gosuncn/mm-plugin-gosuncn.c b/src/plugins/gosuncn/mm-plugin-gosuncn.c
index d140e482..bdc7ea03 100644
--- a/src/plugins/gosuncn/mm-plugin-gosuncn.c
+++ b/src/plugins/gosuncn/mm-plugin-gosuncn.c
@@ -39,6 +39,7 @@ MM_DEFINE_PLUGIN (GOSUNCN, gosuncn, Gosuncn)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -61,6 +63,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Gosuncn modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -70,6 +73,7 @@ create_modem (MMPlugin *self,
/* Fallback to default modem in the worst case */
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/haier/mm-plugin-haier.c b/src/plugins/haier/mm-plugin-haier.c
index e152c666..19874091 100644
--- a/src/plugins/haier/mm-plugin-haier.c
+++ b/src/plugins/haier/mm-plugin-haier.c
@@ -30,6 +30,7 @@ MM_DEFINE_PLUGIN (HAIER, haier, Haier)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -38,6 +39,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
index a0cb5443..38bf2702 100644
--- a/src/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.c
@@ -4421,6 +4421,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemHuawei *
mm_broadband_modem_huawei_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -4428,6 +4429,7 @@ mm_broadband_modem_huawei_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_HUAWEI,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.h b/src/plugins/huawei/mm-broadband-modem-huawei.h
index 9fb16811..2a47eb20 100644
--- a/src/plugins/huawei/mm-broadband-modem-huawei.h
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemHuaweiClass{
GType mm_broadband_modem_huawei_get_type (void);
MMBroadbandModemHuawei *mm_broadband_modem_huawei_new (const gchar *device,
+ const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/huawei/mm-plugin-huawei.c b/src/plugins/huawei/mm-plugin-huawei.c
index b0b7a616..1af45447 100644
--- a/src/plugins/huawei/mm-plugin-huawei.c
+++ b/src/plugins/huawei/mm-plugin-huawei.c
@@ -619,6 +619,7 @@ propagate_port_type_hints (MMPlugin *self,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -632,6 +633,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Huawei modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -643,6 +645,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Huawei modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -651,6 +654,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_huawei_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/icera/mm-broadband-modem-icera.c b/src/plugins/icera/mm-broadband-modem-icera.c
index 759985e0..2d553a00 100644
--- a/src/plugins/icera/mm-broadband-modem-icera.c
+++ b/src/plugins/icera/mm-broadband-modem-icera.c
@@ -2190,6 +2190,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemIcera *
mm_broadband_modem_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -2197,6 +2198,7 @@ mm_broadband_modem_icera_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_ICERA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/icera/mm-broadband-modem-icera.h b/src/plugins/icera/mm-broadband-modem-icera.h
index cb88aaf5..a578a054 100644
--- a/src/plugins/icera/mm-broadband-modem-icera.h
+++ b/src/plugins/icera/mm-broadband-modem-icera.h
@@ -47,6 +47,7 @@ GType mm_broadband_modem_icera_get_type (void);
G_MODULE_EXPORT
MMBroadbandModemIcera *mm_broadband_modem_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/intel/mm-broadband-modem-mbim-intel.c b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
index f6cf33db..da26077d 100644
--- a/src/plugins/intel/mm-broadband-modem-mbim-intel.c
+++ b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
@@ -72,6 +72,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemMbimIntel *
mm_broadband_modem_mbim_intel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -79,6 +80,7 @@ mm_broadband_modem_mbim_intel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_INTEL,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/intel/mm-broadband-modem-mbim-intel.h b/src/plugins/intel/mm-broadband-modem-mbim-intel.h
index 549f179d..f2870bec 100644
--- a/src/plugins/intel/mm-broadband-modem-mbim-intel.h
+++ b/src/plugins/intel/mm-broadband-modem-mbim-intel.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimIntelClass{
GType mm_broadband_modem_mbim_intel_get_type (void);
MMBroadbandModemMbimIntel *mm_broadband_modem_mbim_intel_new (const gchar *device,
+ const gchar *physdev,
const gchar **driver,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/intel/mm-plugin-intel.c b/src/plugins/intel/mm-plugin-intel.c
index 62e23504..2792e736 100644
--- a/src/plugins/intel/mm-plugin-intel.c
+++ b/src/plugins/intel/mm-plugin-intel.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (INTEL, intel, Intel)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Intel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_intel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -55,6 +57,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Generic Intel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/iridium/mm-broadband-modem-iridium.c b/src/plugins/iridium/mm-broadband-modem-iridium.c
index 681d9123..fe6bff6e 100644
--- a/src/plugins/iridium/mm-broadband-modem-iridium.c
+++ b/src/plugins/iridium/mm-broadband-modem-iridium.c
@@ -340,6 +340,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemIridium *
mm_broadband_modem_iridium_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -347,6 +348,7 @@ mm_broadband_modem_iridium_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_IRIDIUM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/iridium/mm-broadband-modem-iridium.h b/src/plugins/iridium/mm-broadband-modem-iridium.h
index b9a1270b..7d9584df 100644
--- a/src/plugins/iridium/mm-broadband-modem-iridium.h
+++ b/src/plugins/iridium/mm-broadband-modem-iridium.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemIridiumClass{
GType mm_broadband_modem_iridium_get_type (void);
MMBroadbandModemIridium *mm_broadband_modem_iridium_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/iridium/mm-plugin-iridium.c b/src/plugins/iridium/mm-plugin-iridium.c
index 6141b4e7..1fede697 100644
--- a/src/plugins/iridium/mm-plugin-iridium.c
+++ b/src/plugins/iridium/mm-plugin-iridium.c
@@ -38,6 +38,7 @@ MM_DEFINE_PLUGIN (IRIDIUM, iridium, Iridium)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_iridium_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/linktop/mm-broadband-modem-linktop.c b/src/plugins/linktop/mm-broadband-modem-linktop.c
index a83682c8..6673072a 100644
--- a/src/plugins/linktop/mm-broadband-modem-linktop.c
+++ b/src/plugins/linktop/mm-broadband-modem-linktop.c
@@ -228,6 +228,7 @@ set_current_modes (MMIfaceModem *self,
MMBroadbandModemLinktop *
mm_broadband_modem_linktop_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -235,6 +236,7 @@ mm_broadband_modem_linktop_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_LINKTOP,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/linktop/mm-broadband-modem-linktop.h b/src/plugins/linktop/mm-broadband-modem-linktop.h
index 385a20b8..43ec48d6 100644
--- a/src/plugins/linktop/mm-broadband-modem-linktop.h
+++ b/src/plugins/linktop/mm-broadband-modem-linktop.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemLinktopClass{
GType mm_broadband_modem_linktop_get_type (void);
MMBroadbandModemLinktop *mm_broadband_modem_linktop_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/linktop/mm-plugin-linktop.c b/src/plugins/linktop/mm-plugin-linktop.c
index 58dd129a..8edb47ff 100644
--- a/src/plugins/linktop/mm-plugin-linktop.c
+++ b/src/plugins/linktop/mm-plugin-linktop.c
@@ -32,6 +32,7 @@ MM_DEFINE_PLUGIN (LINKTOP, linktop, Linktop)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -40,6 +41,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_linktop_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/longcheer/mm-broadband-modem-longcheer.c b/src/plugins/longcheer/mm-broadband-modem-longcheer.c
index 0926de2c..25dc381d 100644
--- a/src/plugins/longcheer/mm-broadband-modem-longcheer.c
+++ b/src/plugins/longcheer/mm-broadband-modem-longcheer.c
@@ -371,6 +371,7 @@ load_unlock_retries (MMIfaceModem *self,
MMBroadbandModemLongcheer *
mm_broadband_modem_longcheer_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -378,6 +379,7 @@ mm_broadband_modem_longcheer_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_LONGCHEER,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/longcheer/mm-broadband-modem-longcheer.h b/src/plugins/longcheer/mm-broadband-modem-longcheer.h
index 710abeef..b6df1c15 100644
--- a/src/plugins/longcheer/mm-broadband-modem-longcheer.h
+++ b/src/plugins/longcheer/mm-broadband-modem-longcheer.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemLongcheerClass{
GType mm_broadband_modem_longcheer_get_type (void);
MMBroadbandModemLongcheer *mm_broadband_modem_longcheer_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/longcheer/mm-plugin-longcheer.c b/src/plugins/longcheer/mm-plugin-longcheer.c
index a53e6d03..e8a294c8 100644
--- a/src/plugins/longcheer/mm-plugin-longcheer.c
+++ b/src/plugins/longcheer/mm-plugin-longcheer.c
@@ -182,6 +182,7 @@ longcheer_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -190,6 +191,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_longcheer_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/mbm/mm-broadband-modem-mbm.c b/src/plugins/mbm/mm-broadband-modem-mbm.c
index fbc9830c..0c362a70 100644
--- a/src/plugins/mbm/mm-broadband-modem-mbm.c
+++ b/src/plugins/mbm/mm-broadband-modem-mbm.c
@@ -1445,6 +1445,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemMbm *
mm_broadband_modem_mbm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1452,6 +1453,7 @@ mm_broadband_modem_mbm_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/mbm/mm-broadband-modem-mbm.h b/src/plugins/mbm/mm-broadband-modem-mbm.h
index 21eeaef5..a64969eb 100644
--- a/src/plugins/mbm/mm-broadband-modem-mbm.h
+++ b/src/plugins/mbm/mm-broadband-modem-mbm.h
@@ -50,6 +50,7 @@ struct _MMBroadbandModemMbmClass{
GType mm_broadband_modem_mbm_get_type (void);
MMBroadbandModemMbm *mm_broadband_modem_mbm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/mbm/mm-plugin-mbm.c b/src/plugins/mbm/mm-plugin-mbm.c
index c7897e12..e215e30f 100644
--- a/src/plugins/mbm/mm-plugin-mbm.c
+++ b/src/plugins/mbm/mm-plugin-mbm.c
@@ -39,6 +39,7 @@ MM_DEFINE_PLUGIN (MBM, mbm, Mbm)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Ericsson modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -58,6 +60,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_mbm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/motorola/mm-broadband-modem-motorola.c b/src/plugins/motorola/mm-broadband-modem-motorola.c
index 8ebd2114..fbc514e2 100644
--- a/src/plugins/motorola/mm-broadband-modem-motorola.c
+++ b/src/plugins/motorola/mm-broadband-modem-motorola.c
@@ -39,6 +39,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMotorola, mm_broadband_modem_motorola, M
MMBroadbandModemMotorola *
mm_broadband_modem_motorola_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -46,6 +47,7 @@ mm_broadband_modem_motorola_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MOTOROLA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/motorola/mm-broadband-modem-motorola.h b/src/plugins/motorola/mm-broadband-modem-motorola.h
index f57e5b3d..b7f22d57 100644
--- a/src/plugins/motorola/mm-broadband-modem-motorola.h
+++ b/src/plugins/motorola/mm-broadband-modem-motorola.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemMotorolaClass{
GType mm_broadband_modem_motorola_get_type (void);
MMBroadbandModemMotorola *mm_broadband_modem_motorola_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/motorola/mm-plugin-motorola.c b/src/plugins/motorola/mm-plugin-motorola.c
index 987ff40c..bb8627e1 100644
--- a/src/plugins/motorola/mm-plugin-motorola.c
+++ b/src/plugins/motorola/mm-plugin-motorola.c
@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (MOTOROLA, motorola, Motorola)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_motorola_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/mtk/mm-broadband-modem-mtk.c b/src/plugins/mtk/mm-broadband-modem-mtk.c
index 869784f3..ad778503 100644
--- a/src/plugins/mtk/mm-broadband-modem-mtk.c
+++ b/src/plugins/mtk/mm-broadband-modem-mtk.c
@@ -834,6 +834,7 @@ setup_ports (MMBroadbandModem *self)
/*****************************************************************************/
MMBroadbandModemMtk *
mm_broadband_modem_mtk_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -841,6 +842,7 @@ mm_broadband_modem_mtk_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MTK,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/mtk/mm-broadband-modem-mtk.h b/src/plugins/mtk/mm-broadband-modem-mtk.h
index bbe72cc2..1d202dd7 100644
--- a/src/plugins/mtk/mm-broadband-modem-mtk.h
+++ b/src/plugins/mtk/mm-broadband-modem-mtk.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemMtkClass {
GType mm_broadband_modem_mtk_get_type (void);
MMBroadbandModemMtk *mm_broadband_modem_mtk_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/mtk/mm-plugin-mtk.c b/src/plugins/mtk/mm-plugin-mtk.c
index 55f1c2ac..53bbffec 100644
--- a/src/plugins/mtk/mm-plugin-mtk.c
+++ b/src/plugins/mtk/mm-plugin-mtk.c
@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (MTK, mtk, Mtk)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_mtk_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/nokia/mm-broadband-modem-nokia.c b/src/plugins/nokia/mm-broadband-modem-nokia.c
index fd608868..c7c90966 100644
--- a/src/plugins/nokia/mm-broadband-modem-nokia.c
+++ b/src/plugins/nokia/mm-broadband-modem-nokia.c
@@ -327,6 +327,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemNokia *
mm_broadband_modem_nokia_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -334,6 +335,7 @@ mm_broadband_modem_nokia_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOKIA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/nokia/mm-broadband-modem-nokia.h b/src/plugins/nokia/mm-broadband-modem-nokia.h
index d00a5bcb..628db5d7 100644
--- a/src/plugins/nokia/mm-broadband-modem-nokia.h
+++ b/src/plugins/nokia/mm-broadband-modem-nokia.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemNokiaClass{
GType mm_broadband_modem_nokia_get_type (void);
MMBroadbandModemNokia *mm_broadband_modem_nokia_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/nokia/mm-plugin-nokia-icera.c b/src/plugins/nokia/mm-plugin-nokia-icera.c
index bd5c7518..caea0871 100644
--- a/src/plugins/nokia/mm-plugin-nokia-icera.c
+++ b/src/plugins/nokia/mm-plugin-nokia-icera.c
@@ -41,6 +41,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -49,6 +50,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_icera_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/nokia/mm-plugin-nokia.c b/src/plugins/nokia/mm-plugin-nokia.c
index 261b3aa4..ab5fe646 100644
--- a/src/plugins/nokia/mm-plugin-nokia.c
+++ b/src/plugins/nokia/mm-plugin-nokia.c
@@ -42,6 +42,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -50,6 +51,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_nokia_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/novatel/mm-broadband-modem-novatel-lte.c b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
index 19d1c594..1027d22b 100644
--- a/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
+++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
@@ -638,6 +638,7 @@ scan_networks (MMIfaceModem3gpp *self,
MMBroadbandModemNovatelLte *
mm_broadband_modem_novatel_lte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -645,6 +646,7 @@ mm_broadband_modem_novatel_lte_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/novatel/mm-broadband-modem-novatel-lte.h b/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
index 0f64339d..9329b77d 100644
--- a/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
+++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
@@ -42,6 +42,7 @@ struct _MMBroadbandModemNovatelLteClass{
GType mm_broadband_modem_novatel_lte_get_type (void);
MMBroadbandModemNovatelLte *mm_broadband_modem_novatel_lte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/novatel/mm-broadband-modem-novatel.c b/src/plugins/novatel/mm-broadband-modem-novatel.c
index cd8e5676..f0cde18a 100644
--- a/src/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/src/plugins/novatel/mm-broadband-modem-novatel.c
@@ -1535,6 +1535,7 @@ modem_time_check_support (MMIfaceModemTime *self,
MMBroadbandModemNovatel *
mm_broadband_modem_novatel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1542,6 +1543,7 @@ mm_broadband_modem_novatel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/novatel/mm-broadband-modem-novatel.h b/src/plugins/novatel/mm-broadband-modem-novatel.h
index 36604172..e5ca1e46 100644
--- a/src/plugins/novatel/mm-broadband-modem-novatel.h
+++ b/src/plugins/novatel/mm-broadband-modem-novatel.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemNovatelClass{
GType mm_broadband_modem_novatel_get_type (void);
MMBroadbandModemNovatel *mm_broadband_modem_novatel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/novatel/mm-plugin-novatel-lte.c b/src/plugins/novatel/mm-plugin-novatel-lte.c
index b34686a1..0222bb2c 100644
--- a/src/plugins/novatel/mm-plugin-novatel-lte.c
+++ b/src/plugins/novatel/mm-plugin-novatel-lte.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (NOVATEL_LTE, novatel_lte, NovatelLte)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -43,6 +44,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_novatel_lte_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/novatel/mm-plugin-novatel.c b/src/plugins/novatel/mm-plugin-novatel.c
index a8a570b5..9b7508b5 100644
--- a/src/plugins/novatel/mm-plugin-novatel.c
+++ b/src/plugins/novatel/mm-plugin-novatel.c
@@ -45,6 +45,7 @@ MM_DEFINE_PLUGIN (NOVATEL, novatel, Novatel)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -56,6 +57,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Novatel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -64,6 +66,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_novatel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/option/mm-broadband-modem-hso.c b/src/plugins/option/mm-broadband-modem-hso.c
index a2cc1770..34f17f01 100644
--- a/src/plugins/option/mm-broadband-modem-hso.c
+++ b/src/plugins/option/mm-broadband-modem-hso.c
@@ -691,6 +691,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemHso *
mm_broadband_modem_hso_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -698,6 +699,7 @@ mm_broadband_modem_hso_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_HSO,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/option/mm-broadband-modem-hso.h b/src/plugins/option/mm-broadband-modem-hso.h
index b918719c..2490933d 100644
--- a/src/plugins/option/mm-broadband-modem-hso.h
+++ b/src/plugins/option/mm-broadband-modem-hso.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemHsoClass{
GType mm_broadband_modem_hso_get_type (void);
MMBroadbandModemHso *mm_broadband_modem_hso_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c
index dcecd5b0..98bf0090 100644
--- a/src/plugins/option/mm-broadband-modem-option.c
+++ b/src/plugins/option/mm-broadband-modem-option.c
@@ -1115,6 +1115,7 @@ is_nozomi (const gchar **drivers)
MMBroadbandModemOption *
mm_broadband_modem_option_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1127,6 +1128,7 @@ mm_broadband_modem_option_new (const gchar *device,
return g_object_new (MM_TYPE_BROADBAND_MODEM_OPTION,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/option/mm-broadband-modem-option.h b/src/plugins/option/mm-broadband-modem-option.h
index faf0595e..481c28a1 100644
--- a/src/plugins/option/mm-broadband-modem-option.h
+++ b/src/plugins/option/mm-broadband-modem-option.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemOptionClass{
GType mm_broadband_modem_option_get_type (void);
MMBroadbandModemOption *mm_broadband_modem_option_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/option/mm-plugin-hso.c b/src/plugins/option/mm-plugin-hso.c
index 14fd0bd5..f56cda6d 100644
--- a/src/plugins/option/mm-plugin-hso.c
+++ b/src/plugins/option/mm-plugin-hso.c
@@ -110,6 +110,7 @@ hso_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -118,6 +119,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_hso_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/option/mm-plugin-option.c b/src/plugins/option/mm-plugin-option.c
index b1ada6eb..42530ee7 100644
--- a/src/plugins/option/mm-plugin-option.c
+++ b/src/plugins/option/mm-plugin-option.c
@@ -33,6 +33,7 @@ MM_DEFINE_PLUGIN (OPTION, option, Option)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -41,6 +42,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_option_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/pantech/mm-broadband-modem-pantech.c b/src/plugins/pantech/mm-broadband-modem-pantech.c
index 4e8b58e0..d286dc38 100644
--- a/src/plugins/pantech/mm-broadband-modem-pantech.c
+++ b/src/plugins/pantech/mm-broadband-modem-pantech.c
@@ -139,6 +139,7 @@ modem_after_sim_unlock (MMIfaceModem *self,
MMBroadbandModemPantech *
mm_broadband_modem_pantech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -146,6 +147,7 @@ mm_broadband_modem_pantech_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_PANTECH,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/pantech/mm-broadband-modem-pantech.h b/src/plugins/pantech/mm-broadband-modem-pantech.h
index 4a0a3a27..b3d95d15 100644
--- a/src/plugins/pantech/mm-broadband-modem-pantech.h
+++ b/src/plugins/pantech/mm-broadband-modem-pantech.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemPantechClass{
GType mm_broadband_modem_pantech_get_type (void);
MMBroadbandModemPantech *mm_broadband_modem_pantech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/pantech/mm-plugin-pantech.c b/src/plugins/pantech/mm-plugin-pantech.c
index 7e3e14ee..c32c7a52 100644
--- a/src/plugins/pantech/mm-plugin-pantech.c
+++ b/src/plugins/pantech/mm-plugin-pantech.c
@@ -75,6 +75,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -86,6 +87,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Pantech modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -94,6 +96,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_pantech_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
index 21d62c12..fa19bd4d 100644
--- a/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
+++ b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
@@ -144,6 +144,7 @@ peek_port_qmi_for_data (MMBroadbandModemQmi *self,
MMBroadbandModemQmiQcomSoc *
mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -151,6 +152,7 @@ mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_QCOM_SOC,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
index 92c37beb..da4035e6 100644
--- a/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
+++ b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemQmiQcomSocClass{
GType mm_broadband_modem_qmi_qcom_soc_get_type (void);
MMBroadbandModemQmiQcomSoc *mm_broadband_modem_qmi_qcom_soc_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
index 0d2a5619..c44a4c6c 100644
--- a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
+++ b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
@@ -40,6 +40,7 @@ MM_DEFINE_PLUGIN (QCOM_SOC, qcom_soc, QcomSoc)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -55,6 +56,7 @@ create_modem (MMPlugin *self,
mm_obj_dbg (self, "Qualcomm SoC modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_qcom_soc_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
index 0ab40610..a4aa4118 100644
--- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
@@ -38,6 +38,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimQuectel, mm_broadband_modem_mbim_que
MMBroadbandModemMbimQuectel *
mm_broadband_modem_mbim_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -45,6 +46,7 @@ mm_broadband_modem_mbim_quectel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_QUECTEL,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
index 0d0c2b95..dbfac101 100644
--- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
@@ -40,6 +40,7 @@ struct _MMBroadbandModemMbimQuectelClass{
GType mm_broadband_modem_mbim_quectel_get_type (void);
MMBroadbandModemMbimQuectel *mm_broadband_modem_mbim_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index a4ccbfc9..a1342e64 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiQuectel, mm_broadband_modem_qmi_quect
MMBroadbandModemQmiQuectel *
mm_broadband_modem_qmi_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_qmi_quectel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_QUECTEL,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
index f1580f0e..3391b35e 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemQmiQuectelClass{
GType mm_broadband_modem_qmi_quectel_get_type (void);
MMBroadbandModemQmiQuectel *mm_broadband_modem_qmi_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index ad66b783..a66ff10b 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
@@ -41,6 +41,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQuectel, mm_broadband_modem_quectel, MM_
MMBroadbandModemQuectel *
mm_broadband_modem_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -48,6 +49,7 @@ mm_broadband_modem_quectel_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QUECTEL,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.h b/src/plugins/quectel/mm-broadband-modem-quectel.h
index bf4ef7a7..2067ff10 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemQuectelClass{
GType mm_broadband_modem_quectel_get_type (void);
MMBroadbandModemQuectel *mm_broadband_modem_quectel_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/quectel/mm-plugin-quectel.c b/src/plugins/quectel/mm-plugin-quectel.c
index a9553bd5..a88ba035 100644
--- a/src/plugins/quectel/mm-plugin-quectel.c
+++ b/src/plugins/quectel/mm-plugin-quectel.c
@@ -40,6 +40,7 @@ MM_DEFINE_PLUGIN (QUECTEL, quectel, Quectel)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -51,6 +52,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Quectel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_quectel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -62,6 +64,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Quectel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_quectel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -70,6 +73,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_quectel_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/samsung/mm-broadband-modem-samsung.c b/src/plugins/samsung/mm-broadband-modem-samsung.c
index 1ffc178f..77d2eaa9 100644
--- a/src/plugins/samsung/mm-broadband-modem-samsung.c
+++ b/src/plugins/samsung/mm-broadband-modem-samsung.c
@@ -61,6 +61,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemSamsung *
mm_broadband_modem_samsung_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -68,6 +69,7 @@ mm_broadband_modem_samsung_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_SAMSUNG,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/samsung/mm-broadband-modem-samsung.h b/src/plugins/samsung/mm-broadband-modem-samsung.h
index 106f973c..cbe331a6 100644
--- a/src/plugins/samsung/mm-broadband-modem-samsung.h
+++ b/src/plugins/samsung/mm-broadband-modem-samsung.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemSamsungClass{
GType mm_broadband_modem_samsung_get_type (void);
MMBroadbandModemSamsung *mm_broadband_modem_samsung_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/samsung/mm-plugin-samsung.c b/src/plugins/samsung/mm-plugin-samsung.c
index ee16a09f..24b39117 100644
--- a/src/plugins/samsung/mm-plugin-samsung.c
+++ b/src/plugins/samsung/mm-plugin-samsung.c
@@ -36,6 +36,7 @@ MM_DEFINE_PLUGIN (SAMSUNG, samsung, Samsung)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -44,6 +45,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_samsung_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/sierra/mm-broadband-modem-sierra-icera.c b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
index c7dfcf81..bf26f8e1 100644
--- a/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
+++ b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
@@ -99,6 +99,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemSierraIcera *
mm_broadband_modem_sierra_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -106,6 +107,7 @@ mm_broadband_modem_sierra_icera_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/sierra/mm-broadband-modem-sierra-icera.h b/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
index 97b07d19..6adc6eea 100644
--- a/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
+++ b/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemSierraIceraClass {
GType mm_broadband_modem_sierra_icera_get_type (void);
MMBroadbandModemSierraIcera *mm_broadband_modem_sierra_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/sierra/mm-broadband-modem-sierra.c b/src/plugins/sierra/mm-broadband-modem-sierra.c
index 83611f6d..61595d90 100644
--- a/src/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/src/plugins/sierra/mm-broadband-modem-sierra.c
@@ -1840,6 +1840,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemSierra *
mm_broadband_modem_sierra_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1847,6 +1848,7 @@ mm_broadband_modem_sierra_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIERRA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/sierra/mm-broadband-modem-sierra.h b/src/plugins/sierra/mm-broadband-modem-sierra.h
index 9804b184..e285ad49 100644
--- a/src/plugins/sierra/mm-broadband-modem-sierra.h
+++ b/src/plugins/sierra/mm-broadband-modem-sierra.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemSierraClass{
GType mm_broadband_modem_sierra_get_type (void);
MMBroadbandModemSierra *mm_broadband_modem_sierra_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/sierra/mm-plugin-sierra-legacy.c b/src/plugins/sierra/mm-plugin-sierra-legacy.c
index ea69ad88..80c64358 100644
--- a/src/plugins/sierra/mm-plugin-sierra-legacy.c
+++ b/src/plugins/sierra/mm-plugin-sierra-legacy.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (SIERRA_LEGACY, sierra_legacy, SierraLegacy)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -44,12 +45,14 @@ create_modem (MMPlugin *self,
{
if (mm_common_sierra_port_probe_list_is_icera (probes))
return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
product));
return MM_BASE_MODEM (mm_broadband_modem_sierra_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/sierra/mm-plugin-sierra.c b/src/plugins/sierra/mm-plugin-sierra.c
index a232b33d..cc762432 100644
--- a/src/plugins/sierra/mm-plugin-sierra.c
+++ b/src/plugins/sierra/mm-plugin-sierra.c
@@ -44,6 +44,7 @@ MM_DEFINE_PLUGIN (SIERRA, sierra, Sierra)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -55,6 +56,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Sierra modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -67,6 +69,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "MBIM-powered XMM-based Sierra modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -74,6 +77,7 @@ create_modem (MMPlugin *self,
}
mm_obj_dbg (self, "MBIM-powered Sierra modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -84,6 +88,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_xmm (probes)) {
mm_obj_dbg (self, "XMM-based Sierra modem found...");
return MM_BASE_MODEM (mm_broadband_modem_xmm_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -92,6 +97,7 @@ create_modem (MMPlugin *self,
/* Fallback to default modem in the worst case */
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
index 93ff8576..05dee87c 100644
--- a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
@@ -44,6 +44,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiSimtech, mm_broadband_modem_qmi_simte
MMBroadbandModemQmiSimtech *
mm_broadband_modem_qmi_simtech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -51,6 +52,7 @@ mm_broadband_modem_qmi_simtech_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_QMI_SIMTECH,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
index 2f5b819b..3d3904ac 100644
--- a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemQmiSimtechClass{
GType mm_broadband_modem_qmi_simtech_get_type (void);
MMBroadbandModemQmiSimtech *mm_broadband_modem_qmi_simtech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c
index 2ca0c6ae..79d1ba60 100644
--- a/src/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.c
@@ -1204,6 +1204,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemSimtech *
mm_broadband_modem_simtech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1211,6 +1212,7 @@ mm_broadband_modem_simtech_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIMTECH,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.h b/src/plugins/simtech/mm-broadband-modem-simtech.h
index a2b57fea..ec112bea 100644
--- a/src/plugins/simtech/mm-broadband-modem-simtech.h
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemSimtechClass{
GType mm_broadband_modem_simtech_get_type (void);
MMBroadbandModemSimtech *mm_broadband_modem_simtech_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/simtech/mm-plugin-simtech.c b/src/plugins/simtech/mm-plugin-simtech.c
index f3a5c89c..c40457ca 100644
--- a/src/plugins/simtech/mm-plugin-simtech.c
+++ b/src/plugins/simtech/mm-plugin-simtech.c
@@ -37,6 +37,7 @@ MM_DEFINE_PLUGIN (SIMTECH, simtech, Simtech)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -48,6 +49,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered SimTech modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_simtech_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -56,6 +58,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_simtech_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/telit/mm-broadband-modem-mbim-telit.c b/src/plugins/telit/mm-broadband-modem-mbim-telit.c
index d14dd94a..907c2844 100644
--- a/src/plugins/telit/mm-broadband-modem-mbim-telit.c
+++ b/src/plugins/telit/mm-broadband-modem-mbim-telit.c
@@ -202,6 +202,7 @@ load_revision (MMIfaceModem *self,
MMBroadbandModemMbimTelit *
mm_broadband_modem_mbim_telit_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -210,6 +211,7 @@ mm_broadband_modem_mbim_telit_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_TELIT,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/telit/mm-broadband-modem-mbim-telit.h b/src/plugins/telit/mm-broadband-modem-mbim-telit.h
index 50c21e20..6e84f64a 100644
--- a/src/plugins/telit/mm-broadband-modem-mbim-telit.h
+++ b/src/plugins/telit/mm-broadband-modem-mbim-telit.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimTelitClass{
GType mm_broadband_modem_mbim_telit_get_type (void);
MMBroadbandModemMbimTelit *mm_broadband_modem_mbim_telit_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/telit/mm-broadband-modem-telit.c b/src/plugins/telit/mm-broadband-modem-telit.c
index 1683d38a..141d8d1f 100644
--- a/src/plugins/telit/mm-broadband-modem-telit.c
+++ b/src/plugins/telit/mm-broadband-modem-telit.c
@@ -1459,6 +1459,7 @@ modem_3gpp_enable_unsolicited_events (MMIfaceModem3gpp *self,
MMBroadbandModemTelit *
mm_broadband_modem_telit_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1466,6 +1467,7 @@ mm_broadband_modem_telit_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_TELIT,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/telit/mm-broadband-modem-telit.h b/src/plugins/telit/mm-broadband-modem-telit.h
index f68465e7..26a5326f 100644
--- a/src/plugins/telit/mm-broadband-modem-telit.h
+++ b/src/plugins/telit/mm-broadband-modem-telit.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemTelitClass{
GType mm_broadband_modem_telit_get_type (void);
MMBroadbandModemTelit *mm_broadband_modem_telit_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/telit/mm-plugin-telit.c b/src/plugins/telit/mm-plugin-telit.c
index 4cca3c68..b623aedf 100644
--- a/src/plugins/telit/mm-plugin-telit.c
+++ b/src/plugins/telit/mm-plugin-telit.c
@@ -44,6 +44,7 @@ MM_DEFINE_PLUGIN (TELIT, telit, Telit)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -55,6 +56,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered Telit modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -66,6 +68,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered Telit modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_telit_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -75,6 +78,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_telit_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/thuraya/mm-broadband-modem-thuraya.c b/src/plugins/thuraya/mm-broadband-modem-thuraya.c
index 92c8a8a2..badcf968 100644
--- a/src/plugins/thuraya/mm-broadband-modem-thuraya.c
+++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.c
@@ -214,6 +214,7 @@ modem_messaging_load_supported_storages (MMIfaceModemMessaging *self,
MMBroadbandModemThuraya *
mm_broadband_modem_thuraya_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -221,6 +222,7 @@ mm_broadband_modem_thuraya_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_THURAYA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/thuraya/mm-broadband-modem-thuraya.h b/src/plugins/thuraya/mm-broadband-modem-thuraya.h
index 42df9b9c..5ca79ba0 100644
--- a/src/plugins/thuraya/mm-broadband-modem-thuraya.h
+++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.h
@@ -42,6 +42,7 @@ struct _MMBroadbandModemThurayaClass{
GType mm_broadband_modem_thuraya_get_type (void);
MMBroadbandModemThuraya *mm_broadband_modem_thuraya_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/thuraya/mm-plugin-thuraya.c b/src/plugins/thuraya/mm-plugin-thuraya.c
index e8d4149b..5a9d9b6c 100644
--- a/src/plugins/thuraya/mm-plugin-thuraya.c
+++ b/src/plugins/thuraya/mm-plugin-thuraya.c
@@ -40,6 +40,7 @@ MM_DEFINE_PLUGIN (THURAYA, thuraya, Thuraya)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -48,6 +49,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_thuraya_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/tplink/mm-plugin-tplink.c b/src/plugins/tplink/mm-plugin-tplink.c
index af74c209..e8632e23 100644
--- a/src/plugins/tplink/mm-plugin-tplink.c
+++ b/src/plugins/tplink/mm-plugin-tplink.c
@@ -35,6 +35,7 @@ MM_DEFINE_PLUGIN (TPLINK, tplink, Tplink)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -46,6 +47,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered TP-Link modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -54,6 +56,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c
index 12be08c3..2859e4dd 100644
--- a/src/plugins/ublox/mm-broadband-modem-ublox.c
+++ b/src/plugins/ublox/mm-broadband-modem-ublox.c
@@ -1972,6 +1972,7 @@ setup_ports (MMBroadbandModem *_self)
MMBroadbandModemUblox *
mm_broadband_modem_ublox_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1979,6 +1980,7 @@ mm_broadband_modem_ublox_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_UBLOX,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/ublox/mm-broadband-modem-ublox.h b/src/plugins/ublox/mm-broadband-modem-ublox.h
index f1c6bbcf..8319fcbf 100644
--- a/src/plugins/ublox/mm-broadband-modem-ublox.h
+++ b/src/plugins/ublox/mm-broadband-modem-ublox.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemUbloxClass{
GType mm_broadband_modem_ublox_get_type (void);
MMBroadbandModemUblox *mm_broadband_modem_ublox_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/ublox/mm-plugin-ublox.c b/src/plugins/ublox/mm-plugin-ublox.c
index c88369de..e8db539b 100644
--- a/src/plugins/ublox/mm-plugin-ublox.c
+++ b/src/plugins/ublox/mm-plugin-ublox.c
@@ -32,6 +32,7 @@ MM_DEFINE_PLUGIN (UBLOX, ublox, Ublox)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *sysfs_path,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -40,6 +41,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_ublox_new (sysfs_path,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/via/mm-broadband-modem-via.c b/src/plugins/via/mm-broadband-modem-via.c
index 896db8cd..424698ff 100644
--- a/src/plugins/via/mm-broadband-modem-via.c
+++ b/src/plugins/via/mm-broadband-modem-via.c
@@ -448,6 +448,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemVia *
mm_broadband_modem_via_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -455,6 +456,7 @@ mm_broadband_modem_via_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_VIA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/via/mm-broadband-modem-via.h b/src/plugins/via/mm-broadband-modem-via.h
index 2a31117f..22602c70 100644
--- a/src/plugins/via/mm-broadband-modem-via.h
+++ b/src/plugins/via/mm-broadband-modem-via.h
@@ -41,6 +41,7 @@ struct _MMBroadbandModemViaClass{
GType mm_broadband_modem_via_get_type (void);
MMBroadbandModemVia *mm_broadband_modem_via_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/via/mm-plugin-via.c b/src/plugins/via/mm-plugin-via.c
index 2a380266..32bcd739 100644
--- a/src/plugins/via/mm-plugin-via.c
+++ b/src/plugins/via/mm-plugin-via.c
@@ -36,6 +36,7 @@ MM_DEFINE_PLUGIN (VIA, via, Via)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -44,6 +45,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_via_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/wavecom/mm-broadband-modem-wavecom.c b/src/plugins/wavecom/mm-broadband-modem-wavecom.c
index 521e72de..aac7eec2 100644
--- a/src/plugins/wavecom/mm-broadband-modem-wavecom.c
+++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.c
@@ -1253,6 +1253,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemWavecom *
mm_broadband_modem_wavecom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -1260,6 +1261,7 @@ mm_broadband_modem_wavecom_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_WAVECOM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/wavecom/mm-broadband-modem-wavecom.h b/src/plugins/wavecom/mm-broadband-modem-wavecom.h
index 89bdbde8..a5f191af 100644
--- a/src/plugins/wavecom/mm-broadband-modem-wavecom.h
+++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.h
@@ -42,6 +42,7 @@ struct _MMBroadbandModemWavecomClass{
GType mm_broadband_modem_wavecom_get_type (void);
MMBroadbandModemWavecom *mm_broadband_modem_wavecom_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/wavecom/mm-plugin-wavecom.c b/src/plugins/wavecom/mm-plugin-wavecom.c
index 328a4a21..cb4fe1bb 100644
--- a/src/plugins/wavecom/mm-plugin-wavecom.c
+++ b/src/plugins/wavecom/mm-plugin-wavecom.c
@@ -39,6 +39,7 @@ MM_DEFINE_PLUGIN (WAVECOM, wavecom, Wavecom)
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -47,6 +48,7 @@ create_modem (MMPlugin *self,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_wavecom_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/x22x/mm-broadband-modem-x22x.c b/src/plugins/x22x/mm-broadband-modem-x22x.c
index 1ce32f57..4f6c75ca 100644
--- a/src/plugins/x22x/mm-broadband-modem-x22x.c
+++ b/src/plugins/x22x/mm-broadband-modem-x22x.c
@@ -353,6 +353,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemX22x *
mm_broadband_modem_x22x_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -360,6 +361,7 @@ mm_broadband_modem_x22x_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_X22X,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/x22x/mm-broadband-modem-x22x.h b/src/plugins/x22x/mm-broadband-modem-x22x.h
index 74c2b48a..d194617c 100644
--- a/src/plugins/x22x/mm-broadband-modem-x22x.h
+++ b/src/plugins/x22x/mm-broadband-modem-x22x.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemX22xClass{
GType mm_broadband_modem_x22x_get_type (void);
MMBroadbandModemX22x *mm_broadband_modem_x22x_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/x22x/mm-plugin-x22x.c b/src/plugins/x22x/mm-plugin-x22x.c
index e68e6b24..2ff44e9d 100644
--- a/src/plugins/x22x/mm-plugin-x22x.c
+++ b/src/plugins/x22x/mm-plugin-x22x.c
@@ -184,6 +184,7 @@ x22x_custom_init (MMPortProbe *probe,
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -195,6 +196,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered X22X modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -203,6 +205,7 @@ create_modem (MMPlugin *self,
#endif
return MM_BASE_MODEM (mm_broadband_modem_x22x_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
diff --git a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
index 287c67f7..8604dfb7 100644
--- a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
@@ -42,6 +42,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmm, mm_broadband_modem_mbim_xmm, MM
MMBroadbandModemMbimXmm *
mm_broadband_modem_mbim_xmm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -49,6 +50,7 @@ mm_broadband_modem_mbim_xmm_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBIM_XMM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
index 88e87cb7..5df6808e 100644
--- a/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
+++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemMbimXmmClass{
GType mm_broadband_modem_mbim_xmm_get_type (void);
MMBroadbandModemMbimXmm *mm_broadband_modem_mbim_xmm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c
index 7698ec66..71931de9 100644
--- a/src/plugins/xmm/mm-broadband-modem-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.c
@@ -45,6 +45,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemXmm, mm_broadband_modem_xmm, MM_TYPE_BRO
MMBroadbandModemXmm *
mm_broadband_modem_xmm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -52,6 +53,7 @@ mm_broadband_modem_xmm_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_XMM,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/xmm/mm-broadband-modem-xmm.h b/src/plugins/xmm/mm-broadband-modem-xmm.h
index f63a4bfc..cef3ba65 100644
--- a/src/plugins/xmm/mm-broadband-modem-xmm.h
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.h
@@ -39,6 +39,7 @@ struct _MMBroadbandModemXmmClass{
GType mm_broadband_modem_xmm_get_type (void);
MMBroadbandModemXmm *mm_broadband_modem_xmm_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/zte/mm-broadband-modem-zte-icera.c b/src/plugins/zte/mm-broadband-modem-zte-icera.c
index 66aea942..f88f9f4e 100644
--- a/src/plugins/zte/mm-broadband-modem-zte-icera.c
+++ b/src/plugins/zte/mm-broadband-modem-zte-icera.c
@@ -142,6 +142,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemZteIcera *
mm_broadband_modem_zte_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
@@ -149,6 +150,7 @@ mm_broadband_modem_zte_icera_new (const gchar *device,
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_ZTE_ICERA,
MM_BASE_MODEM_DEVICE, device,
+ MM_BASE_MODEM_PHYSDEV, physdev,
MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
diff --git a/src/plugins/zte/mm-broadband-modem-zte-icera.h b/src/plugins/zte/mm-broadband-modem-zte-icera.h
index fb319046..f86df72a 100644
--- a/src/plugins/zte/mm-broadband-modem-zte-icera.h
+++ b/src/plugins/zte/mm-broadband-modem-zte-icera.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemZteIceraClass{
GType mm_broadband_modem_zte_icera_get_type (void);
MMBroadbandModemZteIcera *mm_broadband_modem_zte_icera_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/zte/mm-broadband-modem-zte.c b/src/plugins/zte/mm-broadband-modem-zte.c
index 35283531..275ad9fc 100644
--- a/src/plugins/zte/mm-broadband-modem-zte.c
+++ b/src/plugins/zte/mm-broadband-modem-zte.c
@@ -680,6 +680,7 @@ setup_ports (MMBroadbandModem *self)
MMBroadbandModemZte *
mm_broadband_modem_zte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/zte/mm-broadband-modem-zte.h b/src/plugins/zte/mm-broadband-modem-zte.h
index a61eead4..13df5022 100644
--- a/src/plugins/zte/mm-broadband-modem-zte.h
+++ b/src/plugins/zte/mm-broadband-modem-zte.h
@@ -43,6 +43,7 @@ struct _MMBroadbandModemZteClass{
GType mm_broadband_modem_zte_get_type (void);
MMBroadbandModemZte *mm_broadband_modem_zte_new (const gchar *device,
+ const gchar *physdev,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
diff --git a/src/plugins/zte/mm-plugin-zte.c b/src/plugins/zte/mm-plugin-zte.c
index 44b16b1b..a7cd1926 100644
--- a/src/plugins/zte/mm-plugin-zte.c
+++ b/src/plugins/zte/mm-plugin-zte.c
@@ -60,6 +60,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *uid,
+ const gchar *physdev,
const gchar **drivers,
guint16 vendor,
guint16 product,
@@ -71,6 +72,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_qmi_port (probes)) {
mm_obj_dbg (self, "QMI-powered ZTE modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -82,6 +84,7 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_has_mbim_port (probes)) {
mm_obj_dbg (self, "MBIM-powered ZTE modem found...");
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
@@ -91,12 +94,14 @@ create_modem (MMPlugin *self,
if (mm_port_probe_list_is_icera (probes))
return MM_BASE_MODEM (mm_broadband_modem_zte_icera_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,
product));
return MM_BASE_MODEM (mm_broadband_modem_zte_new (uid,
+ physdev,
drivers,
mm_plugin_get_name (self),
vendor,