X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevice%2Fdevinst.cpp;h=cb37ceefd51d39b5a5783c4960af9aabbc58f4d0;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=adbf8968595e80cc66441dcd48985fc18d25df5b;hpb=996b7c9da9b5cb56413e829217e1e7d7d7d520da;p=pulseview.git

diff --git a/pv/device/devinst.cpp b/pv/device/devinst.cpp
index adbf896..cb37cee 100644
--- a/pv/device/devinst.cpp
+++ b/pv/device/devinst.cpp
@@ -31,24 +31,16 @@
 namespace pv {
 namespace device {
 
-DevInst::DevInst(sr_dev_inst *sdi) :
-	_sdi(sdi),
+DevInst::DevInst() :
 	_owner(NULL)
 {
-	assert(_sdi);
 }
 
-sr_dev_inst* DevInst::dev_inst() const
-{
-	return _sdi;
-}
-
-void DevInst::use(SigSession *owner)
+void DevInst::use(SigSession *owner) throw(QString)
 {
 	assert(owner);
 	assert(!_owner);
 	_owner = owner;
-	sr_dev_open(_sdi);
 }
 
 void DevInst::release()
@@ -56,7 +48,6 @@ void DevInst::release()
 	if (_owner) {
 		_owner->release_device(this);
 		_owner = NULL;
-		sr_dev_close(_sdi);
 	}
 }
 
@@ -65,36 +56,48 @@ SigSession* DevInst::owner() const
 	return _owner;
 }
 
-GVariant* DevInst::get_config(const sr_probe_group *group, int key)
+GVariant* DevInst::get_config(const sr_channel_group *group, int key)
 {
 	GVariant *data = NULL;
-	if (sr_config_get(_sdi->driver, _sdi, group, key, &data) != SR_OK)
+	assert(_owner);
+	sr_dev_inst *const sdi = dev_inst();
+	assert(sdi);
+	if (sr_config_get(sdi->driver, sdi, group, key, &data) != SR_OK)
 		return NULL;
 	return data;
 }
 
-bool DevInst::set_config(const sr_probe_group *group, int key, GVariant *data)
+bool DevInst::set_config(const sr_channel_group *group, int key, GVariant *data)
 {
-	if(sr_config_set(_sdi, group, key, data) == SR_OK) {
+	assert(_owner);
+	sr_dev_inst *const sdi = dev_inst();
+	assert(sdi);
+	if(sr_config_set(sdi, group, key, data) == SR_OK) {
 		config_changed();
 		return true;
 	}
 	return false;
 }
 
-GVariant* DevInst::list_config(const sr_probe_group *group, int key)
+GVariant* DevInst::list_config(const sr_channel_group *group, int key)
 {
 	GVariant *data = NULL;
-	if (sr_config_list(_sdi->driver, _sdi, group, key, &data) != SR_OK)
+	assert(_owner);
+	sr_dev_inst *const sdi = dev_inst();
+	assert(sdi);
+	if (sr_config_list(sdi->driver, sdi, group, key, &data) != SR_OK)
 		return NULL;
 	return data;
 }
 
-void DevInst::enable_probe(const sr_probe *probe, bool enable)
+void DevInst::enable_probe(const sr_channel *probe, bool enable)
 {
-	for (const GSList *p = _sdi->probes; p; p = p->next)
+	assert(_owner);
+	sr_dev_inst *const sdi = dev_inst();
+	assert(sdi);
+	for (const GSList *p = sdi->channels; p; p = p->next)
 		if (probe == p->data) {
-			const_cast<sr_probe*>(probe)->enabled = enable;
+			const_cast<sr_channel*>(probe)->enabled = enable;
 			config_changed();
 			return;
 		}
@@ -116,5 +119,21 @@ uint64_t DevInst::get_sample_limit()
 	return sample_limit;
 }
 
+bool DevInst::is_trigger_enabled() const
+{
+	return false;
+}
+
+void DevInst::start()
+{
+	if (sr_session_start(SigSession::_sr_session) != SR_OK)
+		throw tr("Failed to start session.");
+}
+
+void DevInst::run()
+{
+	sr_session_run(SigSession::_sr_session);
+}
+
 } // device
 } // pv