X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=c06fd79f3b77891a8605a57c386bb68f806004cc;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=11a5fe3c2ff9564f56ae1dfaf33c81e23eb16859;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 11a5fe3..c06fd79 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -19,91 +19,76 @@
  */
 
 #include "devicemanager.h"
-#include "device/devinst.h"
 #include "sigsession.h"
 
 #include <cassert>
 #include <stdexcept>
+#include <sstream>
 #include <string>
+#include <vector>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
 
-using boost::shared_ptr;
+#include <boost/filesystem.hpp>
+
+using std::dynamic_pointer_cast;
 using std::list;
 using std::map;
 using std::ostringstream;
+using std::remove_if;
 using std::runtime_error;
+using std::shared_ptr;
 using std::string;
+using std::vector;
+
+using Glib::VariantBase;
+
+using sigrok::ConfigKey;
+using sigrok::Context;
+using sigrok::Driver;
+using sigrok::Device;
+using sigrok::HardwareDevice;
+using sigrok::SessionDevice;
 
 namespace pv {
 
-DeviceManager::DeviceManager(struct sr_context *sr_ctx) :
-	_sr_ctx(sr_ctx)
+DeviceManager::DeviceManager(shared_ptr<Context> context) :
+	_context(context)
 {
-	init_drivers();
-	scan_all_drivers();
+	for (auto entry : context->drivers())
+		driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
 }
 
 DeviceManager::~DeviceManager()
 {
-	release_devices();
-}
-
-const list< shared_ptr<pv::device::DevInst> >& DeviceManager::devices() const
-{
-	return _devices;
 }
 
-void DeviceManager::use_device(shared_ptr<device::DevInst> dev_inst,
-	SigSession *owner)
+shared_ptr<Context> DeviceManager::context()
 {
-	assert(dev_inst);
-	assert(owner);
-
-	_used_devices[dev_inst] = owner;
-
-	sr_dev_open(dev_inst->dev_inst());
+	return _context;
 }
 
-void DeviceManager::release_device(shared_ptr<device::DevInst> dev_inst)
+const list< shared_ptr<HardwareDevice> >& DeviceManager::devices() const
 {
-	assert(dev_inst);
-
-	// Notify the owner, and remove the device from the used device list
-	map< shared_ptr<device::DevInst>, pv::SigSession*>::const_iterator
-		iter = _used_devices.find(dev_inst);
-	assert(iter != _used_devices.end());
-
-	(*iter).second->release_device(dev_inst);
-	_used_devices.erase(dev_inst);
+	return _devices;
 }
 
-list< shared_ptr<device::DevInst> > DeviceManager::driver_scan(
-	struct sr_dev_driver *const driver, GSList *const drvopts)
+list< shared_ptr<HardwareDevice> > DeviceManager::driver_scan(
+	shared_ptr<Driver> driver, map<const ConfigKey *, VariantBase> drvopts)
 {
-	list< shared_ptr<device::DevInst> > driver_devices;
+	list< shared_ptr<HardwareDevice> > driver_devices;
 
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
 	// list. They will not be valid after the scan.
-	list< shared_ptr<device::DevInst> >::iterator i = _devices.begin();
-	while (i != _devices.end()) {
-		if ((*i)->dev_inst()->driver == driver)
-			i = _devices.erase(i);
-		else
-			i++;
-	}
-
-	// Release this driver and all it's attached devices
-	release_driver(driver);
+	remove_if(_devices.begin(), _devices.end(),
+		[&](shared_ptr<HardwareDevice> device) {
+			return device->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(shared_ptr<device::DevInst>(
-			new device::DevInst((sr_dev_inst*)l->data)));
-	g_slist_free(devices);
+	auto devices = driver->scan(drvopts);
+	driver_devices.insert(driver_devices.end(), devices.begin(), devices.end());
 	driver_devices.sort(compare_devices);
 
 	// Add the scanned devices to the main list
@@ -114,69 +99,115 @@ list< shared_ptr<device::DevInst> > DeviceManager::driver_scan(
 	return driver_devices;
 }
 
-void DeviceManager::init_drivers()
+const map<string, string> DeviceManager::get_device_info(
+	shared_ptr<Device> device)
 {
-	// Initialise all libsigrok drivers
-	sr_dev_driver **const drivers = sr_driver_list();
-	for (sr_dev_driver **driver = drivers; *driver; driver++) {
-		if (sr_driver_init(_sr_ctx, *driver) != SR_OK) {
-			throw runtime_error(
-				string("Failed to initialize driver ") +
-				string((*driver)->name));
-		}
-	}
+	map<string, string> result;
+
+	assert(device);
+
+	if (device->vendor().length() > 0)
+		result["vendor"] = device->vendor();
+	if (device->model().length() > 0)
+		result["model"] = device->model();
+	if (device->version().length() > 0)
+		result["version"] = device->version();
+	if (device->serial_number().length() > 0)
+		result["serial_num"] = device->serial_number();
+	if (device->connection_id().length() > 0)
+		result["connection_id"] = device->connection_id();
+
+	return result;
 }
 
-void DeviceManager::release_devices()
+const shared_ptr<HardwareDevice> DeviceManager::find_device_from_info(
+	const map<string, string> search_info)
 {
-	// Release all the used devices
-	for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
-		_used_devices.begin(); i != _used_devices.end(); i++)
-		release_device((*i).first);
-
-	_used_devices.clear();
+	shared_ptr<HardwareDevice> last_resort_dev;
+	map<string, string> dev_info;
+
+	last_resort_dev = NULL;
+
+	for (shared_ptr<HardwareDevice> dev : _devices) {
+		assert(dev);
+		dev_info = get_device_info(dev);
+
+		// 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;
+	}
 
-	// Clear all the drivers
-	sr_dev_driver **const drivers = sr_driver_list();
-	for (sr_dev_driver **driver = drivers; *driver; driver++)
-		sr_dev_clear(*driver);
+	// 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::scan_all_drivers()
+string DeviceManager::device_description(shared_ptr<Device> device)
 {
-	// Scan all drivers for all devices.
-	struct sr_dev_driver **const drivers = sr_driver_list();
-	for (struct sr_dev_driver **driver = drivers; *driver; driver++)
-		driver_scan(*driver);
-}
+	auto session_device = dynamic_pointer_cast<SessionDevice>(device);
 
-void DeviceManager::release_driver(struct sr_dev_driver *const driver)
-{
-	assert(driver);
-	for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
-		_used_devices.begin(); i != _used_devices.end(); i++)
-		if((*i).first->dev_inst()->driver == driver)
-		{
-			// Notify the current owner of the device
-			(*i).second->release_device((*i).first);
+	if (session_device)
+		return boost::filesystem::path(
+			session_device->parent()->filename()).filename().string();
+
+	ostringstream s;
 
-			// Remove it from the used device list
-			_used_devices.erase(i);
+	vector<string> parts = {device->vendor(), device->model(),
+		device->version(), device->serial_number()};
 
-			// Close the device instance
-			sr_dev_close((*i).first->dev_inst());
+	for (size_t i = 0; i < parts.size(); i++)
+	{
+		if (parts[i].length() > 0)
+		{
+			if (i != 0)
+				s << " ";
+			s << parts[i];
 		}
+	}
+
+	if (device->serial_number().length() == 0 &&
+			device->connection_id().length() > 0)
+		s << " " << device->connection_id();
 
-	// Clear all the old device instances from this driver
-	sr_dev_clear(driver);
+	return s.str();
 }
 
-bool DeviceManager::compare_devices(shared_ptr<device::DevInst> a,
-	shared_ptr<device::DevInst> b)
+bool DeviceManager::compare_devices(shared_ptr<HardwareDevice> a,
+	shared_ptr<HardwareDevice> b)
 {
 	assert(a);
 	assert(b);
-	return a->format_device_title().compare(b->format_device_title()) < 0;
+
+	return device_description(a).compare(device_description(b)) < 0;
 }
 
 } // namespace pv