X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=fb487a8163feb38861cf0f384a792d2704ebbf2c;hb=455935f323eeaf1bf5d153aa0f52d3a4f9edb169;hp=5a72b31b78563c73e3053e107d14b112c9e040b0;hpb=dd63af740355865cc0659dfba74ecf4445414bc8;p=pulseview.git

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 5a72b31b..fb487a81 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -19,15 +19,23 @@
  */
 
 #include "devicemanager.h"
+#include "device/device.h"
+#include "sigsession.h"
 
 #include <cassert>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
+#include <boost/foreach.hpp>
+
 #include <libsigrok/libsigrok.h>
 
-using namespace std;
+using boost::shared_ptr;
+using std::list;
+using std::map;
+using std::ostringstream;
+using std::runtime_error;
+using std::string;
 
 namespace pv {
 
@@ -43,35 +51,36 @@ DeviceManager::~DeviceManager()
 	release_devices();
 }
 
-const std::list<sr_dev_inst*>& DeviceManager::devices() const
+const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
 {
 	return _devices;
 }
 
-list<sr_dev_inst*> DeviceManager::driver_scan(
+list< shared_ptr<device::Device> > DeviceManager::driver_scan(
 	struct sr_dev_driver *const driver, GSList *const drvopts)
 {
-	list<sr_dev_inst*> driver_devices;
+	list< shared_ptr<device::Device> > driver_devices;
 
 	assert(driver);
 
 	// Remove any device instances from this driver from the device
 	// list. They will not be valid after the scan.
-	list<sr_dev_inst*>::iterator i = _devices.begin();
+	list< shared_ptr<device::Device> >::iterator i = _devices.begin();
 	while (i != _devices.end()) {
-		if ((*i)->driver == driver)
+		if ((*i)->dev_inst()->driver == driver)
 			i = _devices.erase(i);
 		else
 			i++;
 	}
 
-	// Clear all the old device instances from this driver
-	sr_dev_clear(driver);
+	// Release this driver and all it's attached devices
+	release_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((sr_dev_inst*)l->data);
+		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);
 
@@ -83,31 +92,6 @@ list<sr_dev_inst*> DeviceManager::driver_scan(
 	return driver_devices;
 }
 
-string DeviceManager::format_device_title(const sr_dev_inst *const sdi)
-{
-	ostringstream s;
-
-	assert(sdi);
-
-	if (sdi->vendor && sdi->vendor[0]) {
-		s << sdi->vendor;
-		if ((sdi->model && sdi->model[0]) ||
-			(sdi->version && sdi->version[0]))
-			s << ' ';
-	}
-
-	if (sdi->model && sdi->model[0]) {
-		s << sdi->model;
-		if (sdi->version && sdi->version[0])
-			s << ' ';
-	}
-
-	if (sdi->version && sdi->version[0])
-		s << sdi->version;
-
-	return s.str();
-}
-
 void DeviceManager::init_drivers()
 {
 	// Initialise all libsigrok drivers
@@ -123,6 +107,13 @@ void DeviceManager::init_drivers()
 
 void DeviceManager::release_devices()
 {
+	// Release all the used devices
+	BOOST_FOREACH(shared_ptr<device::Device> dev, _devices) {
+		assert(dev);
+		dev->release();
+	}
+
+	// Clear all the drivers
 	sr_dev_driver **const drivers = sr_driver_list();
 	for (sr_dev_driver **driver = drivers; *driver; driver++)
 		sr_dev_clear(*driver);
@@ -136,10 +127,24 @@ void DeviceManager::scan_all_drivers()
 		driver_scan(*driver);
 }
 
-bool DeviceManager::compare_devices(const sr_dev_inst *const a,
-	const sr_dev_inst *const b)
+void DeviceManager::release_driver(struct sr_dev_driver *const driver)
+{
+	BOOST_FOREACH(shared_ptr<device::Device> dev, _devices) {
+		assert(dev);
+		if(dev->dev_inst()->driver == driver)
+			dev->release();
+	}
+
+	// Clear all the old device instances from this driver
+	sr_dev_clear(driver);
+}
+
+bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
+	shared_ptr<device::Device> b)
 {
-	return format_device_title(a).compare(format_device_title(b)) < 0;
+	assert(a);
+	assert(b);
+	return a->format_device_title().compare(b->format_device_title()) < 0;
 }
 
 } // namespace pv