Add serial_num/connection_id handling and save/restore last device

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index bbcfbf247675b345ab5af39376a930af132ca2e8..13b44e969cc2720e0d17f86c9ab4871030221f06 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -30,7 +30,6 @@
 
 using std::list;
 using std::map;
-using std::ostringstream;
 using std::runtime_error;
 using std::shared_ptr;
 using std::string;
@@ -90,6 +89,57 @@ list< shared_ptr<device::Device> > DeviceManager::driver_scan(
        return driver_devices;
 }
 
+const shared_ptr<device::Device> DeviceManager::find_device_from_info(
+       const map<string, string> search_info)
+{
+       shared_ptr<device::Device> last_resort_dev;
+       map<string, string> dev_info;
+
+       last_resort_dev = NULL;
+
+       for (shared_ptr<device::Device> dev : _devices) {
+               assert(dev);
+               dev_info = dev->get_device_info();
+
+               // If present, vendor and model always have to match.
+               if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
+                       if (dev_info.at("vendor") != search_info.at("vendor")) continue;
+
+               if (dev_info.count("model") > 0 && search_info.count("model") > 0)
+                       if (dev_info.at("model") != search_info.at("model")) continue;
+
+               // Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
+               if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
+                               && search_info.count("serial_num") > 0)
+                       if (dev_info.at("serial_num") == search_info.at("serial_num") &&
+                                       dev_info.at("serial_num") != "0")
+                               return dev;
+
+               // Second best match: vendor/model/connection_id
+               if (dev_info.count("connection_id") > 0 &&
+                       search_info.count("connection_id") > 0)
+                       if (dev_info.at("connection_id") == search_info.at("connection_id"))
+                               return dev;
+
+               // Last resort: vendor/model/version
+               if (dev_info.count("version") > 0 &&
+                       search_info.count("version") > 0)
+                       if (dev_info.at("version") == search_info.at("version") &&
+                                       dev_info.at("version") != "0")
+                               return dev;
+
+               // For this device, we merely have a vendor/model match.
+               last_resort_dev = dev;
+       }
+
+       // If there wasn't even a vendor/model/version match, we end up here.
+       // This is usually the case for devices with only vendor/model data.
+       // The selected device may be wrong with multiple such devices attached
+       // but it is the best we can do at this point. After all, there may be
+       // only one such device and we do want to select it in this case.
+       return last_resort_dev;
+}
+
 void DeviceManager::init_drivers()
 {
        // Initialise all libsigrok drivers