X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fhardwaredevice.cpp;h=318ce1cab26fa61330563fbdd075a5ab510193be;hp=6374dafe6e03aaddb219a05c1fa4c3a21ab71dd5;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=b485408f20c39ae8d05372a5faffe15653c74705

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index 6374daf..318ce1c 100644
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -43,17 +43,19 @@ namespace devices {
 
 HardwareDevice::HardwareDevice(const std::shared_ptr<sigrok::Context> &context,
 	std::shared_ptr<sigrok::HardwareDevice> device) :
-	context_(context) {
+	context_(context),
+	device_open_(false)
+{
 	device_ = device;
 }
 
-HardwareDevice::~HardwareDevice() {
-	device_->close();
-	if (session_)
-		session_->remove_devices();
+HardwareDevice::~HardwareDevice()
+{
+	close();
 }
 
-string HardwareDevice::full_name() const {
+string HardwareDevice::full_name() const
+{
 	vector<string> parts = {device_->vendor(), device_->model(),
 		device_->version(), device_->serial_number()};
 	if (device_->connection_id().length() > 0)
@@ -61,12 +63,14 @@ string HardwareDevice::full_name() const {
 	return join(parts, " ");
 }
 
-shared_ptr<sigrok::HardwareDevice> HardwareDevice::hardware_device() const {
+shared_ptr<sigrok::HardwareDevice> HardwareDevice::hardware_device() const
+{
 	return static_pointer_cast<sigrok::HardwareDevice>(device_);
 }
 
 string HardwareDevice::display_name(
-	const DeviceManager &device_manager) const {
+	const DeviceManager &device_manager) const
+{
 	const auto hw_dev = hardware_device();
 
 	// If we can find another device with the same model/vendor then
@@ -96,17 +100,33 @@ string HardwareDevice::display_name(
 	return join(parts, " ");
 }
 
-void HardwareDevice::create() {
-	// Open the device
-        try {
-                device_->open();
-        } catch(const sigrok::Error &e) {
-                throw QString(e.what());
-        }
-
-        // Set up the session
-        session_ = context_->create_session();
-        session_->add_device(device_);
+void HardwareDevice::open()
+{
+	if (device_open_)
+		close();
+
+	try {
+		device_->open();
+	} catch (const sigrok::Error &e) {
+		throw QString(e.what());
+	}
+
+	device_open_ = true;
+
+	// Set up the session
+	session_ = context_->create_session();
+	session_->add_device(device_);
+}
+
+void HardwareDevice::close()
+{
+	if (device_open_)
+		device_->close();
+
+	if (session_)
+		session_->remove_devices();
+
+	device_open_ = false;
 }
 
 } // namespace devices