X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=5b9630631a1fe9c1e104e9f8437745c49d2c61ba;hp=b7e910e3a4839268792b9bf970033ac2d6c1c69c;hb=eec446e1588c41eb14de5e21a8383d10653c15bd;hpb=aba1dd166b90f3408cd9d2b23b906df081845563 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index b7e910e3..5b963063 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -20,10 +20,10 @@ #include "sigsession.h" -#include "analogdata.h" -#include "analogdatasnapshot.h" -#include "logicdata.h" -#include "logicdatasnapshot.h" +#include "data/analog.h" +#include "data/analogsnapshot.h" +#include "data/logic.h" +#include "data/logicsnapshot.h" #include "view/analogsignal.h" #include "view/logicsignal.h" @@ -103,7 +103,7 @@ vector< shared_ptr > SigSession::get_signals() return _signals; } -boost::shared_ptr SigSession::get_data() +boost::shared_ptr SigSession::get_data() { return _logic_data; } @@ -140,6 +140,8 @@ void SigSession::load_thread_proc(const string name) void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, uint64_t record_length) { + assert(sdi); + sr_session_new(); sr_session_datafeed_callback_add(data_feed_in_proc); @@ -149,16 +151,18 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, return; } - if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES, + // Set the sample limit + if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, &record_length) != SR_OK) { qDebug() << "Failed to configure time-based sample limit."; sr_session_destroy(); return; } + // Set the samplerate { lock_guard lock(_sampling_mutex); - if (sr_dev_config_set(sdi, SR_HWCAP_SAMPLERATE, + if (sr_config_set(sdi, SR_CONF_SAMPLERATE, &_sample_rate) != SR_OK) { qDebug() << "Failed to configure samplerate."; sr_session_destroy(); @@ -179,68 +183,94 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, set_capture_state(Stopped); } -void SigSession::feed_in_meta_logic(const struct sr_dev_inst *sdi, - const sr_datafeed_meta_logic &meta_logic) +void SigSession::feed_in_header(const sr_dev_inst *sdi) { - using view::LogicSignal; + shared_ptr signal; + unsigned int logic_probe_count = 0; + unsigned int analog_probe_count = 0; + + // Detect what data types we will receive + for (const GSList *l = sdi->probes; l; l = l->next) { + const sr_probe *const probe = (const sr_probe *)l->data; + if (!probe->enabled) + continue; + + switch(probe->type) { + case SR_PROBE_LOGIC: + logic_probe_count++; + break; + + case SR_PROBE_ANALOG: + analog_probe_count++; + break; + } + } + // Create data containers for the coming data snapshots { lock_guard data_lock(_data_mutex); lock_guard sampling_lock(_sampling_mutex); - // Create an empty LogicData for coming data snapshots - _logic_data.reset(new LogicData(meta_logic, _sample_rate)); - assert(_logic_data); - if (!_logic_data) - return; + if (logic_probe_count != 0) { + _logic_data.reset(new data::Logic( + logic_probe_count, _sample_rate)); + assert(_logic_data); + } + + if (analog_probe_count != 0) { + _analog_data.reset(new data::Analog(_sample_rate)); + assert(_analog_data); + } } + // Make the logic probe list { lock_guard lock(_signals_mutex); - // Add the signals - for (int i = 0; i < meta_logic.num_probes; i++) { + _signals.clear(); + + for (const GSList *l = sdi->probes; l; l = l->next) { const sr_probe *const probe = - (const sr_probe*)g_slist_nth_data( - sdi->probes, i); - if (probe->enabled) { - shared_ptr signal( - new LogicSignal(probe->name, + (const sr_probe *)l->data; + assert(probe); + if (!probe->enabled) + continue; + + switch(probe->type) { + case SR_PROBE_LOGIC: + signal = shared_ptr( + new view::LogicSignal(probe->name, _logic_data, probe->index)); - _signals.push_back(signal); + break; + + case SR_PROBE_ANALOG: + signal = shared_ptr( + new view::AnalogSignal(probe->name, + _analog_data)); + break; } + + _signals.push_back(signal); } signals_changed(); } } -void SigSession::feed_in_meta_analog(const struct sr_dev_inst *sdi, - const sr_datafeed_meta_analog &meta_analog) +void SigSession::feed_in_meta(const sr_dev_inst *sdi, + const sr_datafeed_meta &meta) { - using view::AnalogSignal; - - { - lock_guard data_lock(_data_mutex); - lock_guard sampling_lock(_sampling_mutex); - - // Create an empty AnalogData for coming data snapshots - _analog_data.reset(new AnalogData( - meta_analog, _sample_rate)); - assert(_analog_data); - if (!_analog_data) - return; - } - - { - lock_guard lock(_signals_mutex); - - // Add the signals - shared_ptr signal( - new AnalogSignal(QString("???"), _analog_data)); - _signals.push_back(signal); - - signals_changed(); + for (const GSList *l = meta.config; l; l = l->next) { + const sr_config *const src = (const sr_config*)l->data; + switch (src->key) { + case SR_CONF_SAMPLERATE: + /// @todo handle samplerate changes + /// samplerate = (uint64_t *)src->value; + break; + default: + // Unknown metadata is not an error. + break; + } } } @@ -249,9 +279,11 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) lock_guard lock(_data_mutex); if (!_cur_logic_snapshot) { + assert(_logic_data); + // Create a new data snapshot - _cur_logic_snapshot = shared_ptr( - new LogicDataSnapshot(logic)); + _cur_logic_snapshot = shared_ptr( + new data::LogicSnapshot(logic)); _logic_data->push_snapshot(_cur_logic_snapshot); } else @@ -268,9 +300,11 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) lock_guard lock(_data_mutex); if (!_cur_analog_snapshot) { + assert(_analog_data); + // Create a new data snapshot - _cur_analog_snapshot = shared_ptr( - new AnalogDataSnapshot(analog)); + _cur_analog_snapshot = shared_ptr( + new data::AnalogSnapshot(analog)); _analog_data->push_snapshot(_cur_analog_snapshot); } else @@ -290,22 +324,13 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, switch (packet->type) { case SR_DF_HEADER: - { - lock_guard lock(_signals_mutex); - _signals.clear(); - break; - } - - case SR_DF_META_LOGIC: - assert(packet->payload); - feed_in_meta_logic(sdi, - *(const sr_datafeed_meta_logic*)packet->payload); + feed_in_header(sdi); break; - case SR_DF_META_ANALOG: + case SR_DF_META: assert(packet->payload); - feed_in_meta_analog(sdi, - *(const sr_datafeed_meta_analog*)packet->payload); + feed_in_meta(sdi, + *(const sr_datafeed_meta*)packet->payload); break; case SR_DF_LOGIC: