X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=13b44e969cc2720e0d17f86c9ab4871030221f06;hb=6842b5fc481eb43d9aeea81f17e211820d6dc405;hp=5a72b31b78563c73e3053e107d14b112c9e040b0;hpb=dd63af740355865cc0659dfba74ecf4445414bc8;p=pulseview.git

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 5a72b31..13b44e9 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -19,15 +19,20 @@
  */
 
 #include "devicemanager.h"
+#include "device/device.h"
+#include "sigsession.h"
 
 #include <cassert>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
 #include <libsigrok/libsigrok.h>
 
-using namespace std;
+using std::list;
+using std::map;
+using std::runtime_error;
+using std::shared_ptr;
+using std::string;
 
 namespace pv {
 
@@ -43,35 +48,36 @@ DeviceManager::~DeviceManager()
 	release_devices();
 }
 
-const std::list<sr_dev_inst*>& DeviceManager::devices() const
+const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
 {
 	return _devices;
 }
 
-list<sr_dev_inst*> DeviceManager::driver_scan(
+list< shared_ptr<device::Device> > DeviceManager::driver_scan(
 	struct sr_dev_driver *const driver, GSList *const drvopts)
 {
-	list<sr_dev_inst*> driver_devices;
+	list< shared_ptr<device::Device> > driver_devices;
 
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
 	// list. They will not be valid after the scan.
-	list<sr_dev_inst*>::iterator i = _devices.begin();
+	auto i = _devices.begin();
 	while (i != _devices.end()) {
-		if ((*i)->driver == driver)
+		if ((*i)->dev_inst()->driver == driver)
 			i = _devices.erase(i);
 		else
 			i++;
 	}
 
-	// Clear all the old device instances from this driver
-	sr_dev_clear(driver);
+	// Release this driver and all it's attached devices
+	release_driver(driver);
 
 	// Do the scan
 	GSList *const devices = sr_driver_scan(driver, drvopts);
 	for (GSList *l = devices; l; l = l->next)
-		driver_devices.push_back((sr_dev_inst*)l->data);
+		driver_devices.push_back(shared_ptr<device::Device>(
+			new device::Device((sr_dev_inst*)l->data)));
 	g_slist_free(devices);
 	driver_devices.sort(compare_devices);
 
@@ -83,29 +89,55 @@ list<sr_dev_inst*> DeviceManager::driver_scan(
 	return driver_devices;
 }
 
-string DeviceManager::format_device_title(const sr_dev_inst *const sdi)
+const shared_ptr<device::Device> DeviceManager::find_device_from_info(
+	const map<string, string> search_info)
 {
-	ostringstream s;
-
-	assert(sdi);
-
-	if (sdi->vendor && sdi->vendor[0]) {
-		s << sdi->vendor;
-		if ((sdi->model && sdi->model[0]) ||
-			(sdi->version && sdi->version[0]))
-			s << ' ';
+	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 (sdi->model && sdi->model[0]) {
-		s << sdi->model;
-		if (sdi->version && sdi->version[0])
-			s << ' ';
-	}
-
-	if (sdi->version && sdi->version[0])
-		s << sdi->version;
-
-	return s.str();
+	// 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()
@@ -123,6 +155,13 @@ void DeviceManager::init_drivers()
 
 void DeviceManager::release_devices()
 {
+	// Release all the used devices
+	for (shared_ptr<device::Device> dev : _devices) {
+		assert(dev);
+		dev->release();
+	}
+
+	// Clear all the drivers
 	sr_dev_driver **const drivers = sr_driver_list();
 	for (sr_dev_driver **driver = drivers; *driver; driver++)
 		sr_dev_clear(*driver);
@@ -136,10 +175,24 @@ void DeviceManager::scan_all_drivers()
 		driver_scan(*driver);
 }
 
-bool DeviceManager::compare_devices(const sr_dev_inst *const a,
-	const sr_dev_inst *const b)
+void DeviceManager::release_driver(struct sr_dev_driver *const driver)
+{
+	for (shared_ptr<device::Device> dev : _devices) {
+		assert(dev);
+		if(dev->dev_inst()->driver == driver)
+			dev->release();
+	}
+
+	// Clear all the old device instances from this driver
+	sr_dev_clear(driver);
+}
+
+bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
+	shared_ptr<device::Device> b)
 {
-	return format_device_title(a).compare(format_device_title(b)) < 0;
+	assert(a);
+	assert(b);
+	return a->format_device_title().compare(b->format_device_title()) < 0;
 }
 
 } // namespace pv