core: use hardware IDs as part of DeviceIdentifier

Pass the device's hardware IDs through modem creation and use them
when calculating the device's identifier.  Add a bunch of testcases
for real hardware to ensure we don't break the device ID in the
future unless we really want to.

1 files changed, 9 insertions, 1 deletions

diff --git a/plugins/mm-plugin-x22x.c b/plugins/mm-plugin-x22x.c
index ecad48ed..5a8253fe 100644
--- a/plugins/mm-plugin-x22x.c
+++ b/plugins/mm-plugin-x22x.c
@@ -115,6 +115,7 @@ grab_port (MMPluginBase *base,
     const char *name, *subsys, *sysfs_path;
     guint32 caps;
     MMPortType ptype = MM_PORT_TYPE_UNKNOWN;
+    guint16 vendor = 0, product = 0;
 
     port = mm_plugin_base_supports_task_get_port (task);
     g_assert (port);
@@ -139,13 +140,20 @@ grab_port (MMPluginBase *base,
     subsys = g_udev_device_get_subsystem (port);
     name = g_udev_device_get_name (port);
 
+    if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product)) {
+        g_set_error (error, 0, 0, "Could not get modem product ID.");
+        return NULL;
+    }
+
     caps = mm_plugin_base_supports_task_get_probed_capabilities (task);
     sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task);
     if (!existing) {
         if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) {
             modem = mm_modem_x22x_gsm_new (sysfs_path,
                                            mm_plugin_base_supports_task_get_driver (task),
-                                           mm_plugin_get_name (MM_PLUGIN (base)));
+                                           mm_plugin_get_name (MM_PLUGIN (base)),
+                                           vendor,
+                                           product);
         }
 
         if (modem) {