X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=2c9343001211409e8e836d95c9d5d623417ebcd2;hp=43d93a7a88f5778d0bed24bcead6ec1f2e9dc85e;hb=58d8e4c6c50bb119d405d754a6fb122d932d6510;hpb=941e22a645e89e7253f0faeb63b74ee97201dd91

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 43d93a7..2c93430 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -23,12 +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;
@@ -40,6 +44,8 @@ class Context;
 class Driver;
 }
 
+using sigrok::ConfigKey;
+
 namespace pv {
 
 namespace devices {
@@ -52,7 +58,7 @@ class Session;
 class DeviceManager
 {
 public:
-	DeviceManager(shared_ptr<sigrok::Context> context);
+	DeviceManager(shared_ptr<sigrok::Context> context, std::string driver);
 
 	~DeviceManager() = default;
 
@@ -61,6 +67,7 @@ public:
 	shared_ptr<sigrok::Context> context();
 
 	const list< shared_ptr<devices::HardwareDevice> >& devices() const;
+	shared_ptr<devices::HardwareDevice> user_spec_device() const;
 
 	list< shared_ptr<devices::HardwareDevice> > driver_scan(
 		shared_ptr<sigrok::Driver> driver,
@@ -76,9 +83,14 @@ private:
 	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:
 	shared_ptr<sigrok::Context> context_;
 	list< shared_ptr<devices::HardwareDevice> > devices_;
+	shared_ptr<devices::HardwareDevice> user_spec_device_;
 };
 
 } // namespace pv