X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=9b8ef3d120a3a4c68f97a9e359156270516ed4eb;hp=fa116223305a179884c27d400d76b25c53e87caa;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index fa116223..9b8ef3d1 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -14,72 +14,88 @@
  * 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/>.
  */
 
-#ifndef PULSEVIEW_PV_DEVICEMANAGER_H
-#define PULSEVIEW_PV_DEVICEMANAGER_H
+#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
+#define PULSEVIEW_PV_DEVICEMANAGER_HPP
 
 #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;
+class VariantBase;
 }
 
 namespace sigrok {
-	class ConfigKey;
-	class Context;
-	class Driver;
-	class Device;
-	class HardwareDevice;
+class ConfigKey;
+class Context;
+class Driver;
 }
 
+using sigrok::ConfigKey;
+
 namespace pv {
 
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
 class Session;
 
 class DeviceManager
 {
 public:
-	DeviceManager(std::shared_ptr<sigrok::Context> context);
-
-	~DeviceManager();
+	DeviceManager(shared_ptr<sigrok::Context> context,
+		std::string driver, bool do_scan);
 
-	std::shared_ptr<sigrok::Context> context();
+	~DeviceManager() = default;
 
-	const std::list< std::shared_ptr<sigrok::HardwareDevice> >&
-		devices() const;
+	const shared_ptr<sigrok::Context>& context() const;
 
-	std::list< std::shared_ptr<sigrok::HardwareDevice> > driver_scan(
-		std::shared_ptr<sigrok::Driver> driver,
-		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
+	shared_ptr<sigrok::Context> context();
 
-	const std::map<std::string, std::string> get_device_info(
-		const std::shared_ptr<sigrok::Device> device);
+	const list< shared_ptr<devices::HardwareDevice> >& devices() const;
+	shared_ptr<devices::HardwareDevice> user_spec_device() const;
 
-	const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
-		const std::map<std::string, std::string> search_info);
+	bool driver_supported(shared_ptr<sigrok::Driver> driver) const;
 
-	const std::string build_display_name(std::shared_ptr<sigrok::Device> device);
+	list< shared_ptr<devices::HardwareDevice> > driver_scan(
+		shared_ptr<sigrok::Driver> driver,
+		map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
-	const std::string get_display_name(std::shared_ptr<sigrok::Device> dev);
+	const map<string, string> get_device_info(
+		const shared_ptr<devices::Device> device);
 
-	void update_display_name(std::shared_ptr<sigrok::Device> dev);
+	const shared_ptr<devices::HardwareDevice> find_device_from_info(
+		const map<string, string> search_info);
 
 private:
-	bool compare_devices(std::shared_ptr<sigrok::Device> a,
-		std::shared_ptr<sigrok::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<sigrok::HardwareDevice> > devices_;
-	std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
+	shared_ptr<sigrok::Context> context_;
+	list< shared_ptr<devices::HardwareDevice> > devices_;
+	shared_ptr<devices::HardwareDevice> user_spec_device_;
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DEVICEMANAGER_H
+#endif // PULSEVIEW_PV_DEVICEMANAGER_HPP