X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=2c9343001211409e8e836d95c9d5d623417ebcd2;hp=145f9e80a44e68fbfa96bafe027a4a2781c89e75;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 145f9e80..2c934300 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -23,7 +23,16 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <set>
 #include <string>
+#include <vector>
+
+using std::list;
+using std::map;
+using std::set;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 
 namespace Glib {
 class VariantBase;
@@ -35,6 +44,8 @@ class Context;
 class Driver;
 }
 
+using sigrok::ConfigKey;
+
 namespace pv {
 
 namespace devices {
@@ -47,34 +58,39 @@ class Session;
 class DeviceManager
 {
 public:
-	DeviceManager(std::shared_ptr<sigrok::Context> context);
+	DeviceManager(shared_ptr<sigrok::Context> context, std::string driver);
 
 	~DeviceManager() = default;
 
-	const std::shared_ptr<sigrok::Context>& context() const;
+	const shared_ptr<sigrok::Context>& context() const;
 
-	std::shared_ptr<sigrok::Context> context();
+	shared_ptr<sigrok::Context> context();
 
-	const std::list< std::shared_ptr<devices::HardwareDevice> >&
-		devices() const;
+	const list< shared_ptr<devices::HardwareDevice> >& devices() const;
+	shared_ptr<devices::HardwareDevice> user_spec_device() const;
 
-	std::list< std::shared_ptr<devices::HardwareDevice> > driver_scan(
-		std::shared_ptr<sigrok::Driver> driver,
-		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
+	list< shared_ptr<devices::HardwareDevice> > driver_scan(
+		shared_ptr<sigrok::Driver> driver,
+		map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
-	const std::map<std::string, std::string> get_device_info(
-		const std::shared_ptr<devices::Device> device);
+	const map<string, string> get_device_info(
+		const shared_ptr<devices::Device> device);
 
-	const std::shared_ptr<devices::HardwareDevice> find_device_from_info(
-		const std::map<std::string, std::string> search_info);
+	const shared_ptr<devices::HardwareDevice> find_device_from_info(
+		const map<string, string> search_info);
 
 private:
-	bool compare_devices(std::shared_ptr<devices::Device> a,
-		std::shared_ptr<devices::Device> b);
+	bool compare_devices(shared_ptr<devices::Device> a,
+		shared_ptr<devices::Device> b);
+
+	static map<const ConfigKey *, Glib::VariantBase>
+	drive_scan_options(vector<string> user_spec,
+		set<const ConfigKey *> driver_opts);
 
 protected:
-	std::shared_ptr<sigrok::Context> context_;
-	std::list< std::shared_ptr<devices::HardwareDevice> > devices_;
+	shared_ptr<sigrok::Context> context_;
+	list< shared_ptr<devices::HardwareDevice> > devices_;
+	shared_ptr<devices::HardwareDevice> user_spec_device_;
 };
 
 } // namespace pv