X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=6a69fdca2b99970aa0a86234a92fc0336dcb33c0;hp=e19291d40004d9bdaa5c7611eeaa1aa71e1f1e20;hb=b85f25545939d923f71609e5cc670e48f4f83f19;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e19291d4..6a69fdca 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -20,8 +20,11 @@
 
 #include "sigsession.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"
 
 #include <QDebug>
@@ -55,32 +58,27 @@ SigSession::~SigSession()
 	_session = NULL;
 }
 
-void SigSession::load_file(const std::string &name)
+void SigSession::load_file(const string &name)
 {
-	if (sr_session_load(name.c_str()) == SR_OK) {
-		/* sigrok session file */
-		sr_session_datafeed_callback_add(data_feed_in_proc);
-		sr_session_start();
-		sr_session_run();
-		sr_session_stop();
-	}
+	stop_capture();
+	_sampling_thread.reset(new boost::thread(
+		&SigSession::load_thread_proc, this, name));
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
 {
-	lock_guard<mutex> lock(_state_mutex);
+	lock_guard<mutex> lock(_sampling_mutex);
 	return _capture_state;
 }
 
 void SigSession::start_capture(struct sr_dev_inst *sdi,
-	uint64_t record_length, uint64_t sample_rate)
+	uint64_t record_length)
 {
 	stop_capture();
 
-
 	_sampling_thread.reset(new boost::thread(
 		&SigSession::sample_thread_proc, this, sdi,
-		record_length, sample_rate));
+		record_length));
 }
 
 void SigSession::stop_capture()
@@ -102,21 +100,45 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals()
 	return _signals;
 }
 
-boost::shared_ptr<LogicData> SigSession::get_data()
+boost::shared_ptr<data::Logic> SigSession::get_data()
 {
 	return _logic_data;
 }
 
 void SigSession::set_capture_state(capture_state state)
 {
-	lock_guard<mutex> lock(_state_mutex);
+	lock_guard<mutex> lock(_sampling_mutex);
 	_capture_state = state;
 	capture_state_changed(state);
 }
 
+void SigSession::load_thread_proc(const string name)
+{
+	if (sr_session_load(name.c_str()) != SR_OK) {
+		qDebug() << "Failed to load file.";
+		return;
+	}
+
+	sr_session_datafeed_callback_add(data_feed_in_proc);
+
+	if (sr_session_start() != SR_OK) {
+		qDebug() << "Failed to start session.";
+		return;
+	}
+
+	set_capture_state(Running);
+
+	sr_session_run();
+	sr_session_stop();
+
+	set_capture_state(Stopped);
+}
+
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
-	uint64_t record_length, uint64_t sample_rate)
+	uint64_t record_length)
 {
+	assert(sdi);
+
 	sr_session_new();
 	sr_session_datafeed_callback_add(data_feed_in_proc);
 
@@ -126,20 +148,14 @@ 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;
 	}
 
-	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.";
 		return;
@@ -153,90 +169,179 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 	set_capture_state(Stopped);
 }
 
-void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
-	struct sr_datafeed_packet *packet)
+void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
-	using view::LogicSignal;
-
-	assert(sdi);
-	assert(packet);
+	shared_ptr<view::Signal> signal;
+	uint64_t *sample_rate = NULL;
+	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;
 
-	switch (packet->type) {
-	case SR_DF_HEADER:
-	{
-		lock_guard<mutex> lock(_signals_mutex);
-		_signals.clear();
-		break;
+		case SR_PROBE_ANALOG:
+			analog_probe_count++;
+			break;
+		}
 	}
 
-	case SR_DF_META_LOGIC:
-	{
-		assert(packet->payload);
-		const sr_datafeed_meta_logic &meta_logic =
-			*(sr_datafeed_meta_logic*)packet->payload;
+	// Read out the sample rate
+	assert(sdi->driver);
+	assert(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+		(const void**)&sample_rate, sdi) == SR_OK);
 
+	// Create data containers for the coming data snapshots
 	{
-		lock_guard<mutex> lock(_data_mutex);
+		lock_guard<mutex> data_lock(_data_mutex);
 
-		// Create an empty LogiData for coming data snapshots
-		_logic_data.reset(new LogicData(meta_logic));
-		assert(_logic_data);
-		if (!_logic_data)
-			break;
+		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,
-						_logic_data,
-						probe->index));
-				_signals.push_back(signal);
+				(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));
+				break;
+
+			case SR_PROBE_ANALOG:
+				signal = shared_ptr<view::Signal>(
+					new view::AnalogSignal(probe->name,
+						_analog_data));
+				break;
 			}
+
+			_signals.push_back(signal);
 		}
 
 		signals_changed();
-		break;
 	}
+}
+
+void SigSession::feed_in_meta(const sr_dev_inst *sdi,
+	const sr_datafeed_meta &meta)
+{
+	(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;
+		}
 	}
+}
 
-	case SR_DF_LOGIC:
+void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
+{
+	lock_guard<mutex> lock(_data_mutex);
+	if (!_cur_logic_snapshot)
+	{
+		assert(_logic_data);
+
+		// Create a new data snapshot
+		_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
+			new data::LogicSnapshot(logic));
+		_logic_data->push_snapshot(_cur_logic_snapshot);
+	}
+	else
+	{
+		// Append to the existing data snapshot
+		_cur_logic_snapshot->append_payload(logic);
+	}
+
+	data_updated();
+}
+
+void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
+{
+	lock_guard<mutex> lock(_data_mutex);
+	if (!_cur_analog_snapshot)
+	{
+		assert(_analog_data);
+
+		// Create a new data snapshot
+		_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
+			new data::AnalogSnapshot(analog));
+		_analog_data->push_snapshot(_cur_analog_snapshot);
+	}
+	else
 	{
-		lock_guard<mutex> lock(_data_mutex);
+		// Append to the existing data snapshot
+		_cur_analog_snapshot->append_payload(analog);
+	}
+
+	data_updated();
+}
+
+void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
+	const struct sr_datafeed_packet *packet)
+{
+	assert(sdi);
+	assert(packet);
+
+	switch (packet->type) {
+	case SR_DF_HEADER:
+		feed_in_header(sdi);
+		break;
+
+	case SR_DF_META:
 		assert(packet->payload);
-		if (!_cur_logic_snapshot)
-		{
-			// Create a new data snapshot
-			_cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
-				new LogicDataSnapshot(
-				*(sr_datafeed_logic*)packet->payload));
-			_logic_data->push_snapshot(_cur_logic_snapshot);
-		}
-		else
-		{
-			// Append to the existing data snapshot
-			_cur_logic_snapshot->append_payload(
-				*(sr_datafeed_logic*)packet->payload);
-		}
+		feed_in_meta(sdi,
+			*(const sr_datafeed_meta*)packet->payload);
+		break;
 
-		data_updated();
+	case SR_DF_LOGIC:
+		assert(packet->payload);
+		feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
+		break;
+
+	case SR_DF_ANALOG:
+		assert(packet->payload);
+		feed_in_analog(*(const sr_datafeed_analog*)packet->payload);
 		break;
-	}
 
 	case SR_DF_END:
 	{
 		{
 			lock_guard<mutex> lock(_data_mutex);
 			_cur_logic_snapshot.reset();
+			_cur_analog_snapshot.reset();
 		}
 		data_updated();
 		break;
@@ -245,7 +350,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
-	struct sr_datafeed_packet *packet)
+	const struct sr_datafeed_packet *packet)
 {
 	assert(_session);
 	_session->data_feed_in(sdi, packet);