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

base-modem: add subsystem device ID property

Browse Source 
Subsystem device ID can be used for identifying PCI modems,
so expose the property.

Signed-off-by: Sushrut Shree Trivedi <quic_sushruts@quicinc.com>
This commit is contained in:
Sushrut Shree Trivedi
2025-02-21 10:39:29 +05:30
parent 894b517dae
commit 092439369b
50 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-base-modem.c
+25
View File
@@ -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",
src/mm-base-modem.h
+2
View File
@@ -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);
src/mm-device.c
+12
View File
@@ -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)
src/mm-device.h
+2
View File
@@ -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);
src/mm-plugin.c
+1
View File
@@ -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)
src/mm-plugin.h
+1
View File
@@ -111,6 +111,7 @@ struct _MMPluginClass {
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error);
src/plugins/altair/mm-plugin-altair-lte.c
+1
View File
@@ -55,6 +55,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/anydata/mm-plugin-anydata.c
+1
View File
@@ -42,6 +42,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/broadmobi/mm-plugin-broadmobi.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/cellient/mm-plugin-cellient.c
+1
View File
@@ -36,6 +36,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/cinterion/mm-plugin-cinterion.c
+1
View File
@@ -143,6 +143,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/dell/mm-plugin-dell.c
+1
View File
@@ -375,6 +375,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/dlink/mm-plugin-dlink.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/fibocom/mm-plugin-fibocom.c
+1
View File
@@ -49,6 +49,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/foxconn/mm-plugin-foxconn.c
+1
View File
@@ -50,6 +50,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/generic/mm-plugin-generic.c
+1
View File
@@ -54,6 +54,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/gosuncn/mm-plugin-gosuncn.c
+1
View File
@@ -44,6 +44,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/haier/mm-plugin-haier.c
+1
View File
@@ -35,6 +35,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/huawei/mm-plugin-huawei.c
+1
View File
@@ -624,6 +624,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/intel/mm-plugin-intel.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/iridium/mm-plugin-iridium.c
+1
View File
@@ -43,6 +43,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/linktop/mm-plugin-linktop.c
+1
View File
@@ -37,6 +37,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/longcheer/mm-plugin-longcheer.c
+1
View File
@@ -187,6 +187,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/mbm/mm-plugin-mbm.c
+1
View File
@@ -44,6 +44,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/motorola/mm-plugin-motorola.c
+1
View File
@@ -38,6 +38,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/mtk/mm-plugin-mtk-legacy.c
+1
View File
@@ -38,6 +38,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/mtk/mm-plugin-mtk.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/netprisma/mm-plugin-netprisma.c
+1
View File
@@ -45,6 +45,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/nokia/mm-plugin-nokia-icera.c
+1
View File
@@ -46,6 +46,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/nokia/mm-plugin-nokia.c
+1
View File
@@ -47,6 +47,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/novatel/mm-plugin-novatel-lte.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/novatel/mm-plugin-novatel.c
+1
View File
@@ -50,6 +50,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/option/mm-plugin-hso.c
+1
View File
@@ -115,6 +115,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/option/mm-plugin-option.c
+1
View File
@@ -38,6 +38,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/pantech/mm-plugin-pantech.c
+1
View File
@@ -80,6 +80,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/qcom-soc/mm-plugin-qcom-soc.c
+1
View File
@@ -45,6 +45,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/quectel/mm-plugin-quectel.c
+1
View File
@@ -45,6 +45,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/rolling/mm-plugin-rolling.c
+1
View File
@@ -47,6 +47,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/samsung/mm-plugin-samsung.c
+1
View File
@@ -41,6 +41,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/sierra/mm-plugin-sierra-legacy.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/sierra/mm-plugin-sierra.c
+1
View File
@@ -49,6 +49,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/simtech/mm-plugin-simtech.c
+1
View File
@@ -42,6 +42,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/telit/mm-plugin-telit.c
+1
View File
@@ -49,6 +49,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/thuraya/mm-plugin-thuraya.c
+1
View File
@@ -45,6 +45,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/tplink/mm-plugin-tplink.c
+1
View File
@@ -40,6 +40,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/ublox/mm-plugin-ublox.c
+1
View File
@@ -37,6 +37,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/via/mm-plugin-via.c
+1
View File
@@ -41,6 +41,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/wavecom/mm-plugin-wavecom.c
+1
View File
@@ -44,6 +44,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/x22x/mm-plugin-x22x.c
+1
View File
@@ -189,6 +189,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{
src/plugins/zte/mm-plugin-zte.c
+1
View File
@@ -65,6 +65,7 @@ create_modem (MMPlugin *self,
guint16 vendor,
guint16 product,
guint16 subsystem_vendor,
guint16 subsystem_device,
GList *probes,
GError **error)
{