Update to new session API.

[pulseview.git] / pv / device / devinst.cpp

diff --git a/pv/device/devinst.cpp b/pv/device/devinst.cpp
index 44c1a83154f1f5b046290353a0ddbc4beb36b2da..cb37ceefd51d39b5a5783c4960af9aabbc58f4d0 100644 (file)
--- a/pv/device/devinst.cpp
+++ b/pv/device/devinst.cpp
@@ -36,12 +36,11 @@ DevInst::DevInst() :
 {
 }
 
-void DevInst::use(SigSession *owner)
+void DevInst::use(SigSession *owner) throw(QString)
 {
        assert(owner);
        assert(!_owner);
        _owner = owner;
-       sr_dev_open(dev_inst());
 }
 
 void DevInst::release()
@@ -49,7 +48,6 @@ void DevInst::release()
        if (_owner) {
                _owner->release_device(this);
                _owner = NULL;
-               sr_dev_close(dev_inst());
        }
 }
 
@@ -58,9 +56,10 @@ 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;
+       assert(_owner);
        sr_dev_inst *const sdi = dev_inst();
        assert(sdi);
        if (sr_config_get(sdi->driver, sdi, group, key, &data) != SR_OK)
@@ -68,8 +67,9 @@ GVariant* DevInst::get_config(const sr_probe_group *group, int key)
        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)
 {
+       assert(_owner);
        sr_dev_inst *const sdi = dev_inst();
        assert(sdi);
        if(sr_config_set(sdi, group, key, data) == SR_OK) {
@@ -79,9 +79,10 @@ bool DevInst::set_config(const sr_probe_group *group, int key, GVariant *data)
        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;
+       assert(_owner);
        sr_dev_inst *const sdi = dev_inst();
        assert(sdi);
        if (sr_config_list(sdi->driver, sdi, group, key, &data) != SR_OK)
@@ -89,13 +90,14 @@ GVariant* DevInst::list_config(const sr_probe_group *group, int key)
        return data;
 }
 
-void DevInst::enable_probe(const sr_probe *probe, bool enable)
+void DevInst::enable_probe(const sr_channel *probe, bool enable)
 {
+       assert(_owner);
        sr_dev_inst *const sdi = dev_inst();
        assert(sdi);
-       for (const GSList *p = sdi->probes; p; p = p->next)
+       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;
                }
@@ -117,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