X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=9e3944b5974e4ce5fa1dbd9c2d268c1ebb1e72bd;hp=bbcfbf247675b345ab5af39376a930af132ca2e8;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index bbcfbf24..9e3944b5 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -14,135 +14,183 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "devicemanager.h"
-#include "device/device.h"
-#include "sigsession.h"
+#include "devicemanager.hpp"
+#include "session.hpp"
 
 #include <cassert>
+#include <functional>
 #include <stdexcept>
+#include <sstream>
 #include <string>
+#include <vector>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include <boost/algorithm/string/join.hpp>
+#include <boost/filesystem.hpp>
+
+#include <pv/devices/hardwaredevice.hpp>
+
+using boost::algorithm::join;
+
+using std::bind;
+using std::dynamic_pointer_cast;
 using std::list;
 using std::map;
-using std::ostringstream;
+using std::placeholders::_1;
+using std::placeholders::_2;
+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::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()
+const std::shared_ptr<sigrok::Context>& DeviceManager::context() const
 {
-	release_devices();
+	return context_;
 }
 
-const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
+shared_ptr<Context> DeviceManager::context()
 {
-	return _devices;
+	return context_;
 }
 
-list< shared_ptr<device::Device> > DeviceManager::driver_scan(
-	struct sr_dev_driver *const driver, GSList *const drvopts)
+const list< shared_ptr<devices::HardwareDevice> >&
+DeviceManager::devices() const
 {
-	list< shared_ptr<device::Device> > driver_devices;
+	return devices_;
+}
+
+list< shared_ptr<devices::HardwareDevice> >
+DeviceManager::driver_scan(
+	shared_ptr<Driver> driver, map<const ConfigKey *, VariantBase> drvopts)
+{
+	list< shared_ptr<devices::HardwareDevice> > driver_devices;
 
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
 	// list. They will not be valid after the scan.
-	auto 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);
+	devices_.remove_if([&](shared_ptr<devices::HardwareDevice> device) {
+		return device->hardware_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::Device>(
-			new device::Device((sr_dev_inst*)l->data)));
-	g_slist_free(devices);
-	driver_devices.sort(compare_devices);
-
-	// Add the scanned devices to the main list
-	_devices.insert(_devices.end(), driver_devices.begin(),
-		driver_devices.end());
-	_devices.sort(compare_devices);
+	auto devices = driver->scan(drvopts);
 
-	return driver_devices;
-}
-
-void DeviceManager::init_drivers()
-{
-	// 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));
-		}
+	// Add the scanned devices to the main list, set display names and sort.
+	for (shared_ptr<sigrok::HardwareDevice> device : devices) {
+		const shared_ptr<devices::HardwareDevice> d(
+			new devices::HardwareDevice(context_, device));
+		driver_devices.push_back(d);
 	}
-}
 
-void DeviceManager::release_devices()
-{
-	// Release all the used devices
-	for (shared_ptr<device::Device> dev : _devices) {
-		assert(dev);
-		dev->release();
-	}
+	devices_.insert(devices_.end(), driver_devices.begin(),
+		driver_devices.end());
+	devices_.sort(bind(&DeviceManager::compare_devices, this, _1, _2));
+	driver_devices.sort(bind(
+		&DeviceManager::compare_devices, this, _1, _2));
 
-	// Clear all the drivers
-	sr_dev_driver **const drivers = sr_driver_list();
-	for (sr_dev_driver **driver = drivers; *driver; driver++)
-		sr_dev_clear(*driver);
+	return driver_devices;
 }
 
-void DeviceManager::scan_all_drivers()
+const map<string, string> DeviceManager::get_device_info(
+	shared_ptr<devices::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);
+	map<string, string> result;
+
+	assert(device);
+
+	const shared_ptr<sigrok::Device> sr_dev = device->device();
+	if (sr_dev->vendor().length() > 0)
+		result["vendor"] = sr_dev->vendor();
+	if (sr_dev->model().length() > 0)
+		result["model"] = sr_dev->model();
+	if (sr_dev->version().length() > 0)
+		result["version"] = sr_dev->version();
+	if (sr_dev->serial_number().length() > 0)
+		result["serial_num"] = sr_dev->serial_number();
+	if (sr_dev->connection_id().length() > 0)
+		result["connection_id"] = sr_dev->connection_id();
+
+	return result;
 }
 
-void DeviceManager::release_driver(struct sr_dev_driver *const driver)
+const shared_ptr<devices::HardwareDevice> DeviceManager::find_device_from_info(
+	const map<string, string> search_info)
 {
-	for (shared_ptr<device::Device> dev : _devices) {
+	shared_ptr<devices::HardwareDevice> last_resort_dev;
+	map<string, string> dev_info;
+
+	for (shared_ptr<devices::HardwareDevice> dev : devices_) {
 		assert(dev);
-		if(dev->dev_inst()->driver == driver)
-			dev->release();
+		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 old device instances from this 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;
 }
 
-bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
-	shared_ptr<device::Device> b)
+bool DeviceManager::compare_devices(shared_ptr<devices::Device> a,
+	shared_ptr<devices::Device> b)
 {
 	assert(a);
 	assert(b);
-	return a->format_device_title().compare(b->format_device_title()) < 0;
+	return a->display_name(*this).compare(b->display_name(*this)) < 0;
 }
 
 } // namespace pv