X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevices%2Fhardwaredevice.cpp;h=ff52f817327d6d0d5790c91675e764d1d6091212;hb=93cc1067d3b87a5f5dda6a5ee7dcf83d179c9b6b;hp=b98b0e02f8aa9b2e43756af75835d8bae55723b4;hpb=b8f99b84b701bb086e1d6edb8c32093f3047e31e;p=pulseview.git
diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index b98b0e0..ff52f81 100644
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -28,7 +27,6 @@
#include "hardwaredevice.hpp"
-using std::dynamic_pointer_cast;
using std::shared_ptr;
using std::static_pointer_cast;
using std::string;
@@ -41,22 +39,21 @@ using sigrok::HardwareDevice;
namespace pv {
namespace devices {
-HardwareDevice::HardwareDevice(const std::shared_ptr &context,
- std::shared_ptr device) :
+HardwareDevice::HardwareDevice(const shared_ptr &context,
+ shared_ptr device) :
context_(context),
- device_open_(false) {
+ device_open_(false)
+{
device_ = device;
}
-HardwareDevice::~HardwareDevice() {
- if (device_open_)
- device_->close();
-
- if (session_)
- session_->remove_devices();
+HardwareDevice::~HardwareDevice()
+{
+ close();
}
-string HardwareDevice::full_name() const {
+string HardwareDevice::full_name() const
+{
vector parts = {device_->vendor(), device_->model(),
device_->version(), device_->serial_number()};
if (device_->connection_id().length() > 0)
@@ -64,12 +61,14 @@ string HardwareDevice::full_name() const {
return join(parts, " ");
}
-shared_ptr HardwareDevice::hardware_device() const {
+shared_ptr HardwareDevice::hardware_device() const
+{
return static_pointer_cast(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
@@ -99,11 +98,14 @@ string HardwareDevice::display_name(
return join(parts, " ");
}
-void HardwareDevice::create() {
- // Open the device
+void HardwareDevice::open()
+{
+ if (device_open_)
+ close();
+
try {
device_->open();
- } catch(const sigrok::Error &e) {
+ } catch (const sigrok::Error &e) {
throw QString(e.what());
}
@@ -114,5 +116,16 @@ void HardwareDevice::create() {
session_->add_device(device_);
}
+void HardwareDevice::close()
+{
+ if (device_open_)
+ device_->close();
+
+ if (session_)
+ session_->remove_devices();
+
+ device_open_ = false;
+}
+
} // namespace devices
} // namespace pv