From 894b517dae72d2123f54fe427e837eba7bbc9b14 Mon Sep 17 00:00:00 2001 From: Sushrut Shree Trivedi Date: Tue, 4 Feb 2025 12:11:51 +0530 Subject: kernel-device, generic: add subsystem device ID support Add subsystem device ID support, that can be used in pci devices instead of vendor/device ID customization. Signed-off-by: Sushrut Shree Trivedi --- src/kerneldevice/mm-kernel-device-generic.c | 14 ++++++++++++++ src/kerneldevice/mm-kernel-device-udev.c | 11 +++++++++++ src/kerneldevice/mm-kernel-device.c | 12 ++++++++++++ src/kerneldevice/mm-kernel-device.h | 2 ++ 4 files changed, 39 insertions(+) (limited to 'src') diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c index 81ef962a..1ff63575 100644 --- a/src/kerneldevice/mm-kernel-device-generic.c +++ b/src/kerneldevice/mm-kernel-device-generic.c @@ -69,6 +69,7 @@ struct _MMKernelDeviceGenericPrivate { guint16 physdev_vid; guint16 physdev_pid; guint16 physdev_subsystem_vid; + guint16 physdev_subsystem_pid; guint16 physdev_revision; gchar *physdev_manufacturer; gchar *physdev_product; @@ -402,6 +403,7 @@ preload_contents_pci (MMKernelDeviceGeneric *self) self->priv->physdev_vid = read_sysfs_attribute_as_hex (self->priv->physdev_sysfs_path, "vendor"); self->priv->physdev_pid = read_sysfs_attribute_as_hex (self->priv->physdev_sysfs_path, "device"); self->priv->physdev_subsystem_vid = read_sysfs_attribute_as_hex (self->priv->physdev_sysfs_path, "subsystem_vendor"); + self->priv->physdev_subsystem_pid = read_sysfs_attribute_as_hex (self->priv->physdev_sysfs_path, "subsystem_device"); self->priv->physdev_revision = read_sysfs_attribute_as_hex (self->priv->physdev_sysfs_path, "revision"); /* stop traversing as soon as the physical device is found */ break; @@ -585,6 +587,8 @@ preload_contents (MMKernelDeviceGeneric *self) mm_obj_dbg (self, " product: %04x", self->priv->physdev_pid); if (self->priv->physdev_subsystem_vid) mm_obj_dbg (self, " subsystem vendor: %04x", self->priv->physdev_subsystem_vid); + if (self->priv->physdev_subsystem_pid) + mm_obj_dbg (self, " subsystem device: %04x", self->priv->physdev_subsystem_pid); if (self->priv->physdev_revision) mm_obj_dbg (self, " revision: %04x", self->priv->physdev_revision); if (self->priv->physdev_manufacturer) @@ -704,6 +708,12 @@ kernel_device_get_physdev_subsystem_vid (MMKernelDevice *self) return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_subsystem_vid; } +static guint16 +kernel_device_get_physdev_subsystem_pid (MMKernelDevice *self) +{ + return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_subsystem_pid; +} + static guint16 kernel_device_get_physdev_revision (MMKernelDevice *self) { @@ -827,6 +837,9 @@ check_condition (MMKernelDeviceGeneric *self, else if (g_str_equal (attribute, "subsystem_vendor")) result = ((mm_get_uint_from_hex_str (match->value, &val)) && ((mm_kernel_device_get_physdev_subsystem_vid (MM_KERNEL_DEVICE (self)) == val) == condition_equal)); + else if (g_str_equal (attribute, "subsystem_device")) + result = ((mm_get_uint_from_hex_str (match->value, &val)) && + ((mm_kernel_device_get_physdev_subsystem_pid (MM_KERNEL_DEVICE (self)) == val) == condition_equal)); /* manufacturer in the physdev */ else if (g_str_equal (attribute, "manufacturer")) result = ((self->priv->physdev_manufacturer && g_str_equal (self->priv->physdev_manufacturer, match->value)) == condition_equal); @@ -1214,6 +1227,7 @@ mm_kernel_device_generic_class_init (MMKernelDeviceGenericClass *klass) kernel_device_class->get_physdev_vid = kernel_device_get_physdev_vid; kernel_device_class->get_physdev_pid = kernel_device_get_physdev_pid; kernel_device_class->get_physdev_subsystem_vid = kernel_device_get_physdev_subsystem_vid; + kernel_device_class->get_physdev_subsystem_pid = kernel_device_get_physdev_subsystem_pid; kernel_device_class->get_physdev_revision = kernel_device_get_physdev_revision; kernel_device_class->get_physdev_sysfs_path = kernel_device_get_physdev_sysfs_path; kernel_device_class->get_physdev_subsystem = kernel_device_get_physdev_subsystem; diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c index 09b65db4..7fede022 100644 --- a/src/kerneldevice/mm-kernel-device-udev.c +++ b/src/kerneldevice/mm-kernel-device-udev.c @@ -49,6 +49,7 @@ struct _MMKernelDeviceUdevPrivate { guint16 vendor; guint16 product; guint16 subsystem_vendor; + guint16 subsystem_device; guint16 revision; gchar *driver; @@ -188,6 +189,7 @@ preload_contents_pci (MMKernelDeviceUdev *self) self->priv->vendor = udev_device_get_sysfs_attr_as_hex (iter, "vendor"); self->priv->product = udev_device_get_sysfs_attr_as_hex (iter, "device"); self->priv->subsystem_vendor = udev_device_get_sysfs_attr_as_hex (iter, "subsystem_vendor"); + self->priv->subsystem_device = udev_device_get_sysfs_attr_as_hex (iter, "subsystem_device"); self->priv->revision = udev_device_get_sysfs_attr_as_hex (iter, "revision"); self->priv->physdev = g_object_ref (iter); /* stop traversing as soon as the physical device is found */ @@ -300,6 +302,8 @@ preload_contents (MMKernelDeviceUdev *self) mm_obj_dbg (self, " product: %04x", self->priv->product); if (self->priv->subsystem_vendor) mm_obj_dbg (self, " subsystem vendor: %04x", self->priv->subsystem_vendor); + if (self->priv->subsystem_device) + mm_obj_dbg (self, " subsystem device: %04x", self->priv->subsystem_device); if (self->priv->revision) mm_obj_dbg (self, " revision: %04x", self->priv->revision); } @@ -417,6 +421,12 @@ kernel_device_get_physdev_subsystem_vid (MMKernelDevice *self) return MM_KERNEL_DEVICE_UDEV (self)->priv->subsystem_vendor; } +static guint16 +kernel_device_get_physdev_subsystem_pid (MMKernelDevice *self) +{ + return MM_KERNEL_DEVICE_UDEV (self)->priv->subsystem_device; +} + static guint16 kernel_device_get_physdev_revision (MMKernelDevice *self) { @@ -816,6 +826,7 @@ mm_kernel_device_udev_class_init (MMKernelDeviceUdevClass *klass) kernel_device_class->get_physdev_vid = kernel_device_get_physdev_vid; kernel_device_class->get_physdev_pid = kernel_device_get_physdev_pid; kernel_device_class->get_physdev_subsystem_vid = kernel_device_get_physdev_subsystem_vid; + kernel_device_class->get_physdev_subsystem_pid = kernel_device_get_physdev_subsystem_pid; kernel_device_class->get_physdev_revision = kernel_device_get_physdev_revision; kernel_device_class->get_physdev_sysfs_path = kernel_device_get_physdev_sysfs_path; kernel_device_class->get_physdev_subsystem = kernel_device_get_physdev_subsystem; diff --git a/src/kerneldevice/mm-kernel-device.c b/src/kerneldevice/mm-kernel-device.c index f016133a..875a46a6 100644 --- a/src/kerneldevice/mm-kernel-device.c +++ b/src/kerneldevice/mm-kernel-device.c @@ -117,6 +117,18 @@ mm_kernel_device_get_physdev_subsystem_vid (MMKernelDevice *self) 0); } +guint16 +mm_kernel_device_get_physdev_subsystem_pid (MMKernelDevice *self) +{ + /* when a lower device is available, physdev info taken from it */ + if (self->priv->lower_device) + return mm_kernel_device_get_physdev_subsystem_pid (self->priv->lower_device); + + return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_subsystem_pid ? + MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_subsystem_pid (self) : + 0); +} + guint16 mm_kernel_device_get_physdev_pid (MMKernelDevice *self) { diff --git a/src/kerneldevice/mm-kernel-device.h b/src/kerneldevice/mm-kernel-device.h index 403ae598..54a7ba86 100644 --- a/src/kerneldevice/mm-kernel-device.h +++ b/src/kerneldevice/mm-kernel-device.h @@ -56,6 +56,7 @@ struct _MMKernelDeviceClass { guint16 (* get_physdev_vid) (MMKernelDevice *self); guint16 (* get_physdev_pid) (MMKernelDevice *self); guint16 (* get_physdev_subsystem_vid) (MMKernelDevice *self); + guint16 (* get_physdev_subsystem_pid) (MMKernelDevice *self); guint16 (* get_physdev_revision) (MMKernelDevice *self); const gchar * (* get_physdev_sysfs_path) (MMKernelDevice *self); const gchar * (* get_physdev_subsystem) (MMKernelDevice *self); @@ -93,6 +94,7 @@ const gchar *mm_kernel_device_get_physdev_uid (MMKernelDevice *self); guint16 mm_kernel_device_get_physdev_vid (MMKernelDevice *self); guint16 mm_kernel_device_get_physdev_pid (MMKernelDevice *self); guint16 mm_kernel_device_get_physdev_subsystem_vid (MMKernelDevice *self); +guint16 mm_kernel_device_get_physdev_subsystem_pid (MMKernelDevice *self); guint16 mm_kernel_device_get_physdev_revision (MMKernelDevice *self); const gchar *mm_kernel_device_get_physdev_sysfs_path (MMKernelDevice *self); const gchar *mm_kernel_device_get_physdev_subsystem (MMKernelDevice *self); -- cgit v1.2.3-70-g09d2 From 092439369ba06b488c70514b4e144fc5c83a917c Mon Sep 17 00:00:00 2001 From: Sushrut Shree Trivedi Date: Tue, 4 Feb 2025 12:34:57 +0530 Subject: base-modem: add subsystem device ID property Subsystem device ID can be used for identifying PCI modems, so expose the property. Signed-off-by: Sushrut Shree Trivedi --- src/mm-base-modem.c | 25 +++++++++++++++++++++++++ src/mm-base-modem.h | 2 ++ src/mm-device.c | 12 ++++++++++++ src/mm-device.h | 2 ++ src/mm-plugin.c | 1 + src/mm-plugin.h | 1 + src/plugins/altair/mm-plugin-altair-lte.c | 1 + src/plugins/anydata/mm-plugin-anydata.c | 1 + src/plugins/broadmobi/mm-plugin-broadmobi.c | 1 + src/plugins/cellient/mm-plugin-cellient.c | 1 + src/plugins/cinterion/mm-plugin-cinterion.c | 1 + src/plugins/dell/mm-plugin-dell.c | 1 + src/plugins/dlink/mm-plugin-dlink.c | 1 + src/plugins/fibocom/mm-plugin-fibocom.c | 1 + src/plugins/foxconn/mm-plugin-foxconn.c | 1 + src/plugins/generic/mm-plugin-generic.c | 1 + src/plugins/gosuncn/mm-plugin-gosuncn.c | 1 + src/plugins/haier/mm-plugin-haier.c | 1 + src/plugins/huawei/mm-plugin-huawei.c | 1 + src/plugins/intel/mm-plugin-intel.c | 1 + src/plugins/iridium/mm-plugin-iridium.c | 1 + src/plugins/linktop/mm-plugin-linktop.c | 1 + src/plugins/longcheer/mm-plugin-longcheer.c | 1 + src/plugins/mbm/mm-plugin-mbm.c | 1 + src/plugins/motorola/mm-plugin-motorola.c | 1 + src/plugins/mtk/mm-plugin-mtk-legacy.c | 1 + src/plugins/mtk/mm-plugin-mtk.c | 1 + src/plugins/netprisma/mm-plugin-netprisma.c | 1 + src/plugins/nokia/mm-plugin-nokia-icera.c | 1 + src/plugins/nokia/mm-plugin-nokia.c | 1 + src/plugins/novatel/mm-plugin-novatel-lte.c | 1 + src/plugins/novatel/mm-plugin-novatel.c | 1 + src/plugins/option/mm-plugin-hso.c | 1 + src/plugins/option/mm-plugin-option.c | 1 + src/plugins/pantech/mm-plugin-pantech.c | 1 + src/plugins/qcom-soc/mm-plugin-qcom-soc.c | 1 + src/plugins/quectel/mm-plugin-quectel.c | 1 + src/plugins/rolling/mm-plugin-rolling.c | 1 + src/plugins/samsung/mm-plugin-samsung.c | 1 + src/plugins/sierra/mm-plugin-sierra-legacy.c | 1 + src/plugins/sierra/mm-plugin-sierra.c | 1 + src/plugins/simtech/mm-plugin-simtech.c | 1 + src/plugins/telit/mm-plugin-telit.c | 1 + src/plugins/thuraya/mm-plugin-thuraya.c | 1 + src/plugins/tplink/mm-plugin-tplink.c | 1 + src/plugins/ublox/mm-plugin-ublox.c | 1 + src/plugins/via/mm-plugin-via.c | 1 + src/plugins/wavecom/mm-plugin-wavecom.c | 1 + src/plugins/x22x/mm-plugin-x22x.c | 1 + src/plugins/zte/mm-plugin-zte.c | 1 + 50 files changed, 87 insertions(+) (limited to 'src') diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index b6023039..7213852f 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -60,6 +60,8 @@ enum { PROP_VENDOR_ID, PROP_PRODUCT_ID, PROP_SUBSYSTEM_VENDOR_ID, + PROP_SUBSYSTEM_DEVICE_ID, + PROP_CONNECTION, PROP_REPROBE, PROP_DATA_NET_SUPPORTED, @@ -94,6 +96,7 @@ struct _MMBaseModemPrivate { guint vendor_id; guint product_id; guint subsystem_vendor_id; + guint subsystem_device_id; gboolean hotplugged; gboolean valid; @@ -2119,6 +2122,14 @@ mm_base_modem_get_subsystem_vendor_id (MMBaseModem *self) return self->priv->subsystem_vendor_id; } +guint +mm_base_modem_get_subsystem_device_id (MMBaseModem *self) +{ + g_return_val_if_fail (MM_IS_BASE_MODEM (self), 0); + + return self->priv->subsystem_device_id; +} + /*****************************************************************************/ static gboolean @@ -2285,6 +2296,9 @@ set_property (GObject *object, case PROP_SUBSYSTEM_VENDOR_ID: self->priv->subsystem_vendor_id = g_value_get_uint (value); break; + case PROP_SUBSYSTEM_DEVICE_ID: + self->priv->subsystem_device_id = g_value_get_uint (value); + break; case PROP_CONNECTION: g_clear_object (&self->priv->connection); self->priv->connection = g_value_dup_object (value); @@ -2340,6 +2354,9 @@ get_property (GObject *object, case PROP_SUBSYSTEM_VENDOR_ID: g_value_set_uint (value, self->priv->subsystem_vendor_id); break; + case PROP_SUBSYSTEM_DEVICE_ID: + g_value_set_uint (value, self->priv->subsystem_device_id); + break; case PROP_CONNECTION: g_value_set_object (value, self->priv->connection); break; @@ -2512,6 +2529,14 @@ mm_base_modem_class_init (MMBaseModemClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property (object_class, PROP_SUBSYSTEM_VENDOR_ID, properties[PROP_SUBSYSTEM_VENDOR_ID]); + properties[PROP_SUBSYSTEM_DEVICE_ID] = + g_param_spec_uint (MM_BASE_MODEM_SUBSYSTEM_DEVICE_ID, + "Hardware subsystem device ID", + "Hardware subsystem device ID. Available for pci devices.", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + g_object_class_install_property (object_class, PROP_SUBSYSTEM_DEVICE_ID, properties[PROP_SUBSYSTEM_DEVICE_ID]); + properties[PROP_CONNECTION] = g_param_spec_object (MM_BASE_MODEM_CONNECTION, "Connection", diff --git a/src/mm-base-modem.h b/src/mm-base-modem.h index aab195ac..52670bfb 100644 --- a/src/mm-base-modem.h +++ b/src/mm-base-modem.h @@ -66,6 +66,7 @@ typedef struct _MMBaseModemPrivate MMBaseModemPrivate; #define MM_BASE_MODEM_VENDOR_ID "base-modem-vendor-id" #define MM_BASE_MODEM_PRODUCT_ID "base-modem-product-id" #define MM_BASE_MODEM_SUBSYSTEM_VENDOR_ID "base-modem-subsystem-vendor-id" +#define MM_BASE_MODEM_SUBSYSTEM_DEVICE_ID "base-modem-subsystem-device-id" #define MM_BASE_MODEM_REPROBE "base-modem-reprobe" #define MM_BASE_MODEM_DATA_NET_SUPPORTED "base-modem-data-net-supported" #define MM_BASE_MODEM_DATA_TTY_SUPPORTED "base-modem-data-tty-supported" @@ -211,6 +212,7 @@ const gchar *mm_base_modem_get_plugin (MMBaseModem *self); guint mm_base_modem_get_vendor_id (MMBaseModem *self); guint mm_base_modem_get_product_id (MMBaseModem *self); guint mm_base_modem_get_subsystem_vendor_id (MMBaseModem *self); +guint mm_base_modem_get_subsystem_device_id (MMBaseModem *self); GCancellable *mm_base_modem_peek_cancellable (MMBaseModem *self); diff --git a/src/mm-device.c b/src/mm-device.c index af2332f6..109ba21e 100644 --- a/src/mm-device.c +++ b/src/mm-device.c @@ -72,6 +72,8 @@ struct _MMDevicePrivate { guint16 product; /* Subsystem vendor ID for PCI devices */ guint16 subsystem_vendor; + /* Subsystem device ID for PCI devices */ + guint16 subsystem_device; /* Kernel drivers managing this device */ gchar **drivers; @@ -269,6 +271,9 @@ mm_device_grab_port (MMDevice *self, if (!self->priv->subsystem_vendor) self->priv->subsystem_vendor = mm_kernel_device_get_physdev_subsystem_vid (kernel_port); + if (!self->priv->subsystem_device) + self->priv->subsystem_device = mm_kernel_device_get_physdev_subsystem_pid (kernel_port); + /* Add new port driver */ add_port_driver (self, kernel_port); @@ -614,6 +619,13 @@ mm_device_get_subsystem_vendor (MMDevice *self) return self->priv->subsystem_vendor; } +guint16 +mm_device_get_subsystem_device (MMDevice *self) +{ + return self->priv->subsystem_device; +} + + void mm_device_set_plugin (MMDevice *self, GObject *plugin) diff --git a/src/mm-device.h b/src/mm-device.h index 70c7ada4..f8cefc1d 100644 --- a/src/mm-device.h +++ b/src/mm-device.h @@ -100,6 +100,8 @@ const gchar **mm_device_get_drivers (MMDevice *self); guint16 mm_device_get_vendor (MMDevice *self); guint16 mm_device_get_product (MMDevice *self); guint16 mm_device_get_subsystem_vendor (MMDevice *self); +guint16 mm_device_get_subsystem_device (MMDevice *self); + void mm_device_set_plugin (MMDevice *self, GObject *plugin); GObject *mm_device_peek_plugin (MMDevice *self); diff --git a/src/mm-plugin.c b/src/mm-plugin.c index 8efc24cf..63ff8853 100644 --- a/src/mm-plugin.c +++ b/src/mm-plugin.c @@ -956,6 +956,7 @@ mm_plugin_create_modem (MMPlugin *self, mm_device_get_vendor (device), mm_device_get_product (device), mm_device_get_subsystem_vendor (device), + mm_device_get_subsystem_device (device), port_probes, error); if (!modem) diff --git a/src/mm-plugin.h b/src/mm-plugin.h index c10637f5..73bb8785 100644 --- a/src/mm-plugin.h +++ b/src/mm-plugin.h @@ -111,6 +111,7 @@ struct _MMPluginClass { guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error); diff --git a/src/plugins/altair/mm-plugin-altair-lte.c b/src/plugins/altair/mm-plugin-altair-lte.c index db69688b..a4608250 100644 --- a/src/plugins/altair/mm-plugin-altair-lte.c +++ b/src/plugins/altair/mm-plugin-altair-lte.c @@ -55,6 +55,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/anydata/mm-plugin-anydata.c b/src/plugins/anydata/mm-plugin-anydata.c index c28f6836..50117b2a 100644 --- a/src/plugins/anydata/mm-plugin-anydata.c +++ b/src/plugins/anydata/mm-plugin-anydata.c @@ -42,6 +42,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/broadmobi/mm-plugin-broadmobi.c b/src/plugins/broadmobi/mm-plugin-broadmobi.c index 1c90fc4f..9d0fa4fa 100644 --- a/src/plugins/broadmobi/mm-plugin-broadmobi.c +++ b/src/plugins/broadmobi/mm-plugin-broadmobi.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/cellient/mm-plugin-cellient.c b/src/plugins/cellient/mm-plugin-cellient.c index ec0936e3..3e44f2cf 100644 --- a/src/plugins/cellient/mm-plugin-cellient.c +++ b/src/plugins/cellient/mm-plugin-cellient.c @@ -36,6 +36,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/cinterion/mm-plugin-cinterion.c b/src/plugins/cinterion/mm-plugin-cinterion.c index c07579f6..aefa46e1 100644 --- a/src/plugins/cinterion/mm-plugin-cinterion.c +++ b/src/plugins/cinterion/mm-plugin-cinterion.c @@ -143,6 +143,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/dell/mm-plugin-dell.c b/src/plugins/dell/mm-plugin-dell.c index bec1e9cb..17f257de 100644 --- a/src/plugins/dell/mm-plugin-dell.c +++ b/src/plugins/dell/mm-plugin-dell.c @@ -375,6 +375,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/dlink/mm-plugin-dlink.c b/src/plugins/dlink/mm-plugin-dlink.c index 2d3d05ee..acb6f6ff 100644 --- a/src/plugins/dlink/mm-plugin-dlink.c +++ b/src/plugins/dlink/mm-plugin-dlink.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/fibocom/mm-plugin-fibocom.c b/src/plugins/fibocom/mm-plugin-fibocom.c index 380d8f69..9373e736 100644 --- a/src/plugins/fibocom/mm-plugin-fibocom.c +++ b/src/plugins/fibocom/mm-plugin-fibocom.c @@ -49,6 +49,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/foxconn/mm-plugin-foxconn.c b/src/plugins/foxconn/mm-plugin-foxconn.c index 70da1608..c8a48c07 100644 --- a/src/plugins/foxconn/mm-plugin-foxconn.c +++ b/src/plugins/foxconn/mm-plugin-foxconn.c @@ -50,6 +50,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/generic/mm-plugin-generic.c b/src/plugins/generic/mm-plugin-generic.c index ff982573..690f541e 100644 --- a/src/plugins/generic/mm-plugin-generic.c +++ b/src/plugins/generic/mm-plugin-generic.c @@ -54,6 +54,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/gosuncn/mm-plugin-gosuncn.c b/src/plugins/gosuncn/mm-plugin-gosuncn.c index bdc7ea03..1b9d7767 100644 --- a/src/plugins/gosuncn/mm-plugin-gosuncn.c +++ b/src/plugins/gosuncn/mm-plugin-gosuncn.c @@ -44,6 +44,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/haier/mm-plugin-haier.c b/src/plugins/haier/mm-plugin-haier.c index 19874091..4317bec7 100644 --- a/src/plugins/haier/mm-plugin-haier.c +++ b/src/plugins/haier/mm-plugin-haier.c @@ -35,6 +35,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/huawei/mm-plugin-huawei.c b/src/plugins/huawei/mm-plugin-huawei.c index 1af45447..c59d0dfc 100644 --- a/src/plugins/huawei/mm-plugin-huawei.c +++ b/src/plugins/huawei/mm-plugin-huawei.c @@ -624,6 +624,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/intel/mm-plugin-intel.c b/src/plugins/intel/mm-plugin-intel.c index 72432379..20392114 100644 --- a/src/plugins/intel/mm-plugin-intel.c +++ b/src/plugins/intel/mm-plugin-intel.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/iridium/mm-plugin-iridium.c b/src/plugins/iridium/mm-plugin-iridium.c index 1fede697..d07c909a 100644 --- a/src/plugins/iridium/mm-plugin-iridium.c +++ b/src/plugins/iridium/mm-plugin-iridium.c @@ -43,6 +43,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/linktop/mm-plugin-linktop.c b/src/plugins/linktop/mm-plugin-linktop.c index 8edb47ff..e1c8d1b9 100644 --- a/src/plugins/linktop/mm-plugin-linktop.c +++ b/src/plugins/linktop/mm-plugin-linktop.c @@ -37,6 +37,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/longcheer/mm-plugin-longcheer.c b/src/plugins/longcheer/mm-plugin-longcheer.c index e8a294c8..6cbee6c9 100644 --- a/src/plugins/longcheer/mm-plugin-longcheer.c +++ b/src/plugins/longcheer/mm-plugin-longcheer.c @@ -187,6 +187,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/mbm/mm-plugin-mbm.c b/src/plugins/mbm/mm-plugin-mbm.c index e215e30f..35802222 100644 --- a/src/plugins/mbm/mm-plugin-mbm.c +++ b/src/plugins/mbm/mm-plugin-mbm.c @@ -44,6 +44,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/motorola/mm-plugin-motorola.c b/src/plugins/motorola/mm-plugin-motorola.c index bb8627e1..487af807 100644 --- a/src/plugins/motorola/mm-plugin-motorola.c +++ b/src/plugins/motorola/mm-plugin-motorola.c @@ -38,6 +38,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/mtk/mm-plugin-mtk-legacy.c b/src/plugins/mtk/mm-plugin-mtk-legacy.c index 30dfc5c0..79164469 100644 --- a/src/plugins/mtk/mm-plugin-mtk-legacy.c +++ b/src/plugins/mtk/mm-plugin-mtk-legacy.c @@ -38,6 +38,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/mtk/mm-plugin-mtk.c b/src/plugins/mtk/mm-plugin-mtk.c index a136383f..bf278d77 100644 --- a/src/plugins/mtk/mm-plugin-mtk.c +++ b/src/plugins/mtk/mm-plugin-mtk.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/netprisma/mm-plugin-netprisma.c b/src/plugins/netprisma/mm-plugin-netprisma.c index 5174cd15..6c772092 100644 --- a/src/plugins/netprisma/mm-plugin-netprisma.c +++ b/src/plugins/netprisma/mm-plugin-netprisma.c @@ -45,6 +45,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/nokia/mm-plugin-nokia-icera.c b/src/plugins/nokia/mm-plugin-nokia-icera.c index caea0871..6c3e67de 100644 --- a/src/plugins/nokia/mm-plugin-nokia-icera.c +++ b/src/plugins/nokia/mm-plugin-nokia-icera.c @@ -46,6 +46,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/nokia/mm-plugin-nokia.c b/src/plugins/nokia/mm-plugin-nokia.c index ab5fe646..b2c7f54c 100644 --- a/src/plugins/nokia/mm-plugin-nokia.c +++ b/src/plugins/nokia/mm-plugin-nokia.c @@ -47,6 +47,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/novatel/mm-plugin-novatel-lte.c b/src/plugins/novatel/mm-plugin-novatel-lte.c index 0222bb2c..a0d55bba 100644 --- a/src/plugins/novatel/mm-plugin-novatel-lte.c +++ b/src/plugins/novatel/mm-plugin-novatel-lte.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/novatel/mm-plugin-novatel.c b/src/plugins/novatel/mm-plugin-novatel.c index 9b7508b5..95b90407 100644 --- a/src/plugins/novatel/mm-plugin-novatel.c +++ b/src/plugins/novatel/mm-plugin-novatel.c @@ -50,6 +50,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/option/mm-plugin-hso.c b/src/plugins/option/mm-plugin-hso.c index f56cda6d..9200f047 100644 --- a/src/plugins/option/mm-plugin-hso.c +++ b/src/plugins/option/mm-plugin-hso.c @@ -115,6 +115,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/option/mm-plugin-option.c b/src/plugins/option/mm-plugin-option.c index 42530ee7..e38d3832 100644 --- a/src/plugins/option/mm-plugin-option.c +++ b/src/plugins/option/mm-plugin-option.c @@ -38,6 +38,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/pantech/mm-plugin-pantech.c b/src/plugins/pantech/mm-plugin-pantech.c index c32c7a52..9004e358 100644 --- a/src/plugins/pantech/mm-plugin-pantech.c +++ b/src/plugins/pantech/mm-plugin-pantech.c @@ -80,6 +80,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c index c44a4c6c..f3620dac 100644 --- a/src/plugins/qcom-soc/mm-plugin-qcom-soc.c +++ b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c @@ -45,6 +45,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/quectel/mm-plugin-quectel.c b/src/plugins/quectel/mm-plugin-quectel.c index a88ba035..691d8178 100644 --- a/src/plugins/quectel/mm-plugin-quectel.c +++ b/src/plugins/quectel/mm-plugin-quectel.c @@ -45,6 +45,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/rolling/mm-plugin-rolling.c b/src/plugins/rolling/mm-plugin-rolling.c index fa70c5c2..c2955c11 100644 --- a/src/plugins/rolling/mm-plugin-rolling.c +++ b/src/plugins/rolling/mm-plugin-rolling.c @@ -47,6 +47,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/samsung/mm-plugin-samsung.c b/src/plugins/samsung/mm-plugin-samsung.c index 24b39117..b377bc90 100644 --- a/src/plugins/samsung/mm-plugin-samsung.c +++ b/src/plugins/samsung/mm-plugin-samsung.c @@ -41,6 +41,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/sierra/mm-plugin-sierra-legacy.c b/src/plugins/sierra/mm-plugin-sierra-legacy.c index 80c64358..72024960 100644 --- a/src/plugins/sierra/mm-plugin-sierra-legacy.c +++ b/src/plugins/sierra/mm-plugin-sierra-legacy.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/sierra/mm-plugin-sierra.c b/src/plugins/sierra/mm-plugin-sierra.c index cc762432..b25ebabb 100644 --- a/src/plugins/sierra/mm-plugin-sierra.c +++ b/src/plugins/sierra/mm-plugin-sierra.c @@ -49,6 +49,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/simtech/mm-plugin-simtech.c b/src/plugins/simtech/mm-plugin-simtech.c index c40457ca..404a53a4 100644 --- a/src/plugins/simtech/mm-plugin-simtech.c +++ b/src/plugins/simtech/mm-plugin-simtech.c @@ -42,6 +42,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/telit/mm-plugin-telit.c b/src/plugins/telit/mm-plugin-telit.c index b623aedf..72c42200 100644 --- a/src/plugins/telit/mm-plugin-telit.c +++ b/src/plugins/telit/mm-plugin-telit.c @@ -49,6 +49,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/thuraya/mm-plugin-thuraya.c b/src/plugins/thuraya/mm-plugin-thuraya.c index 5a9d9b6c..ee2c34f8 100644 --- a/src/plugins/thuraya/mm-plugin-thuraya.c +++ b/src/plugins/thuraya/mm-plugin-thuraya.c @@ -45,6 +45,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/tplink/mm-plugin-tplink.c b/src/plugins/tplink/mm-plugin-tplink.c index e8632e23..9f9f598e 100644 --- a/src/plugins/tplink/mm-plugin-tplink.c +++ b/src/plugins/tplink/mm-plugin-tplink.c @@ -40,6 +40,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/ublox/mm-plugin-ublox.c b/src/plugins/ublox/mm-plugin-ublox.c index e8db539b..7921b02f 100644 --- a/src/plugins/ublox/mm-plugin-ublox.c +++ b/src/plugins/ublox/mm-plugin-ublox.c @@ -37,6 +37,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/via/mm-plugin-via.c b/src/plugins/via/mm-plugin-via.c index 32bcd739..e5beffca 100644 --- a/src/plugins/via/mm-plugin-via.c +++ b/src/plugins/via/mm-plugin-via.c @@ -41,6 +41,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/wavecom/mm-plugin-wavecom.c b/src/plugins/wavecom/mm-plugin-wavecom.c index cb4fe1bb..98198913 100644 --- a/src/plugins/wavecom/mm-plugin-wavecom.c +++ b/src/plugins/wavecom/mm-plugin-wavecom.c @@ -44,6 +44,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/x22x/mm-plugin-x22x.c b/src/plugins/x22x/mm-plugin-x22x.c index 2ff44e9d..d26d740b 100644 --- a/src/plugins/x22x/mm-plugin-x22x.c +++ b/src/plugins/x22x/mm-plugin-x22x.c @@ -189,6 +189,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { diff --git a/src/plugins/zte/mm-plugin-zte.c b/src/plugins/zte/mm-plugin-zte.c index a7cd1926..7b41ca8c 100644 --- a/src/plugins/zte/mm-plugin-zte.c +++ b/src/plugins/zte/mm-plugin-zte.c @@ -65,6 +65,7 @@ create_modem (MMPlugin *self, guint16 vendor, guint16 product, guint16 subsystem_vendor, + guint16 subsystem_device, GList *probes, GError **error) { -- cgit v1.2.3-70-g09d2