#include "view/analogsignal.h"
#include "view/logicsignal.h"
-#include <QDebug>
-
#include <assert.h>
+#include <QDebug>
+
using namespace boost;
using namespace std;
_session = NULL;
}
-void SigSession::load_file(const string &name)
+void SigSession::load_file(const string &name,
+ function<void (const QString)> error_handler)
{
stop_capture();
_sampling_thread.reset(new boost::thread(
- &SigSession::load_thread_proc, this, name));
+ &SigSession::load_thread_proc, this, name,
+ error_handler));
}
SigSession::capture_state SigSession::get_capture_state() const
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
- uint64_t record_length, uint64_t sample_rate)
+ uint64_t record_length,
+ function<void (const QString)> error_handler)
{
stop_capture();
- lock_guard<mutex> lock(_sampling_mutex);
- _sample_rate = sample_rate;
+ // Check that at least one probe is enabled
+ const GSList *l;
+ for (l = sdi->probes; l; l = l->next) {
+ sr_probe *const probe = (sr_probe*)l->data;
+ assert(probe);
+ if (probe->enabled)
+ break;
+ }
+
+ if (!l) {
+ error_handler(tr("No probes enabled."));
+ return;
+ }
+ // Begin the session
_sampling_thread.reset(new boost::thread(
&SigSession::sample_thread_proc, this, sdi,
- record_length));
+ record_length, error_handler));
}
void SigSession::stop_capture()
capture_state_changed(state);
}
-void SigSession::load_thread_proc(const string name)
+void SigSession::load_thread_proc(const string name,
+ function<void (const QString)> error_handler)
{
if (sr_session_load(name.c_str()) != SR_OK) {
- qDebug() << "Failed to load file.";
+ error_handler(tr("Failed to load file."));
return;
}
- sr_session_datafeed_callback_add(data_feed_in_proc);
+ sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
if (sr_session_start() != SR_OK) {
- qDebug() << "Failed to start session.";
+ error_handler(tr("Failed to start session."));
return;
}
}
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
- uint64_t record_length)
+ uint64_t record_length,
+ function<void (const QString)> error_handler)
{
+ assert(sdi);
+ assert(error_handler);
+
sr_session_new();
- sr_session_datafeed_callback_add(data_feed_in_proc);
+ sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
if (sr_session_dev_add(sdi) != SR_OK) {
- qDebug() << "Failed to use device.";
+ error_handler(tr("Failed to use device."));
sr_session_destroy();
return;
}
- if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
- &record_length) != SR_OK) {
- qDebug() << "Failed to configure time-based sample limit.";
+ // Set the sample limit
+ if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+ g_variant_new_uint64(record_length)) != SR_OK) {
+ error_handler(tr("Failed to configure "
+ "time-based sample limit."));
sr_session_destroy();
return;
}
- {
- lock_guard<mutex> lock(_sampling_mutex);
- if (sr_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
- &_sample_rate) != SR_OK) {
- qDebug() << "Failed to configure samplerate.";
- sr_session_destroy();
- return;
- }
- }
-
if (sr_session_start() != SR_OK) {
- qDebug() << "Failed to start session.";
+ error_handler(tr("Failed to start session."));
return;
}
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<view::Signal> signal;
+ GVariant *gvar;
+ uint64_t sample_rate = 0;
+ 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;
+ }
+ }
+
+ // Read out the sample rate
+ assert(sdi->driver);
+ const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+ &gvar, sdi);
+ assert(ret == SR_OK);
+ sample_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+
+ // Create data containers for the coming data snapshots
{
lock_guard<mutex> data_lock(_data_mutex);
- lock_guard<mutex> sampling_lock(_sampling_mutex);
- // Create an empty data::Logic for coming data snapshots
- _logic_data.reset(new data::Logic(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<mutex> 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<LogicSignal> 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<view::Signal>(
+ new view::LogicSignal(probe->name,
_logic_data, probe->index));
- _signals.push_back(signal);
+ break;
+
+ case SR_PROBE_ANALOG:
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(probe->name,
+ _analog_data, probe->index));
+ break;
}
+
+ _signals.push_back(signal);
}
signals_changed();
}
}
-void SigSession::feed_in_meta_analog(const struct sr_dev_inst*,
- 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<mutex> data_lock(_data_mutex);
- lock_guard<mutex> sampling_lock(_sampling_mutex);
-
- // Create an empty data::Analog for coming data snapshots
- _analog_data.reset(new data::Analog(
- meta_analog, _sample_rate));
- assert(_analog_data);
- if (!_analog_data)
- return;
- }
-
- {
- lock_guard<mutex> lock(_signals_mutex);
-
- // Add the signals
- shared_ptr<AnalogSignal> signal(
- new AnalogSignal(QString("???"), _analog_data));
- _signals.push_back(signal);
-
- signals_changed();
+ (void)sdi;
+
+ 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;
+ }
}
}
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
{
lock_guard<mutex> lock(_data_mutex);
+
+ if (!_logic_data)
+ {
+ qDebug() << "Unexpected logic packet";
+ return;
+ }
+
if (!_cur_logic_snapshot)
{
// Create a new data snapshot
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
+
+ if(!_analog_data)
+ {
+ qDebug() << "Unexpected analog packet";
+ return; // This analog packet was not expected.
+ }
+
if (!_cur_analog_snapshot)
{
// Create a new data snapshot
switch (packet->type) {
case SR_DF_HEADER:
- {
- lock_guard<mutex> 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:
}
void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *packet)
+ const struct sr_datafeed_packet *packet, void *cb_data)
{
+ (void) cb_data;
assert(_session);
_session->data_feed_in(sdi, packet);
}
projects / pulseview.git / blobdiff