X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=f3eb19460593141de7b33740bb94eb2d0e69f4a3;hp=e22b75a642bfbe635d85f21bcf8275a7073413f8;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=174e27a1f67683c608277ae522931579cad30eaf

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e22b75a6..f3eb1946 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,384 +18,627 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "sigsession.h"
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
-#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 "sigsession.hpp"
 
-#include <assert.h>
+#include "devicemanager.hpp"
 
-#include <QDebug>
+#include "data/analog.hpp"
+#include "data/analogsnapshot.hpp"
+#include "data/decoderstack.hpp"
+#include "data/logic.hpp"
+#include "data/logicsnapshot.hpp"
+#include "data/decode/decoder.hpp"
 
-using namespace boost;
-using namespace std;
+#include "view/analogsignal.hpp"
+#include "view/decodetrace.hpp"
+#include "view/logicsignal.hpp"
 
-namespace pv {
+#include <cassert>
+#include <mutex>
+#include <stdexcept>
+
+#include <sys/stat.h>
+
+#include <QDebug>
 
-// TODO: This should not be necessary
-SigSession* SigSession::_session = NULL;
+#include <libsigrok/libsigrok.hpp>
+
+using boost::shared_lock;
+using boost::shared_mutex;
+using boost::unique_lock;
+
+using std::dynamic_pointer_cast;
+using std::function;
+using std::lock_guard;
+using std::list;
+using std::map;
+using std::mutex;
+using std::set;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+
+using sigrok::Analog;
+using sigrok::Channel;
+using sigrok::ChannelType;
+using sigrok::ConfigKey;
+using sigrok::DatafeedCallbackFunction;
+using sigrok::Device;
+using sigrok::Error;
+using sigrok::HardwareDevice;
+using sigrok::Header;
+using sigrok::Logic;
+using sigrok::Meta;
+using sigrok::Packet;
+using sigrok::PacketPayload;
+using sigrok::Session;
+using sigrok::SessionDevice;
+
+using Glib::VariantBase;
+using Glib::Variant;
 
-SigSession::SigSession() :
-	_capture_state(Stopped)
+namespace pv {
+SigSession::SigSession(DeviceManager &device_manager) :
+	device_manager_(device_manager),
+	session_(device_manager.context()->create_session()),
+	capture_state_(Stopped)
 {
-	// TODO: This should not be necessary
-	_session = this;
+	set_default_device();
 }
 
 SigSession::~SigSession()
 {
+	// Stop and join to the thread
 	stop_capture();
+}
 
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+DeviceManager& SigSession::device_manager()
+{
+	return device_manager_;
+}
 
-	// TODO: This should not be necessary
-	_session = NULL;
+const DeviceManager& SigSession::device_manager() const
+{
+	return device_manager_;
 }
 
-void SigSession::load_file(const string &name,
-	function<void (const QString)> error_handler)
+const shared_ptr<sigrok::Session>& SigSession::session() const
 {
-	stop_capture();
-	_sampling_thread.reset(new boost::thread(
-		&SigSession::load_thread_proc, this, name,
-		error_handler));
+	return session_;
 }
 
-SigSession::capture_state SigSession::get_capture_state() const
+shared_ptr<Device> SigSession::device() const
 {
-	lock_guard<mutex> lock(_sampling_mutex);
-	return _capture_state;
+	return device_;
 }
 
-void SigSession::start_capture(struct sr_dev_inst *sdi,
-	uint64_t record_length,
-	function<void (const QString)> error_handler)
+void SigSession::set_device(shared_ptr<Device> device)
 {
+	// Ensure we are not capturing before setting the device
 	stop_capture();
 
-	// 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;
-	}
+	// Are we setting a session device?
+	auto session_device = dynamic_pointer_cast<SessionDevice>(device);
+	// Did we have a session device selected previously?
+	auto prev_session_device = dynamic_pointer_cast<SessionDevice>(device_);
 
-	if (!l) {
-		error_handler(tr("No probes enabled."));
-		return;
+	if (device_) {
+		session_->remove_datafeed_callbacks();
+		if (!prev_session_device) {
+			device_->close();
+			session_->remove_devices();
+		}
 	}
 
-	// Begin the session
-	_sampling_thread.reset(new boost::thread(
-		&SigSession::sample_thread_proc, this, sdi,
-		record_length, error_handler));
-}
+	if (session_device)
+		session_ = session_device->parent();
 
-void SigSession::stop_capture()
-{
-	if (get_capture_state() == Stopped)
-		return;
+	device_ = device;
+	decode_traces_.clear();
 
-	sr_session_stop();
-
-	// Check that sampling stopped
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	if (device) {
+		if (!session_device)
+		{
+			session_ = device_manager_.context()->create_session();
+			device->open();
+			session_->add_device(device);
+		}
+		session_->add_datafeed_callback([=]
+			(shared_ptr<Device> device, shared_ptr<Packet> packet) {
+				data_feed_in(device, packet);
+			});
+		update_signals(device);
+	}
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals()
+void SigSession::set_file(const string &name)
 {
-	lock_guard<mutex> lock(_signals_mutex);
-	return _signals;
+	session_ = device_manager_.context()->load_session(name);
+	device_ = session_->devices()[0];
+	decode_traces_.clear();
+	session_->add_datafeed_callback([=]
+		(shared_ptr<Device> device, shared_ptr<Packet> packet) {
+			data_feed_in(device, packet);
+		});
+	device_manager_.update_display_name(device_);
+	update_signals(device_);
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+void SigSession::set_default_device()
 {
-	return _logic_data;
+	shared_ptr<HardwareDevice> default_device;
+	const list< shared_ptr<HardwareDevice> > &devices =
+		device_manager_.devices();
+
+	if (!devices.empty()) {
+		// Fall back to the first device in the list.
+		default_device = devices.front();
+
+		// Try and find the demo device and select that by default
+		for (shared_ptr<HardwareDevice> dev : devices)
+			if (dev->driver()->name().compare("demo") == 0) {
+				default_device = dev;
+				break;
+			}
+
+		set_device(default_device);
+	}
 }
 
-void SigSession::set_capture_state(capture_state state)
+SigSession::capture_state SigSession::get_capture_state() const
 {
-	lock_guard<mutex> lock(_sampling_mutex);
-	_capture_state = state;
-	capture_state_changed(state);
+	lock_guard<mutex> lock(sampling_mutex_);
+	return capture_state_;
 }
 
-void SigSession::load_thread_proc(const string name,
-	function<void (const QString)> error_handler)
+void SigSession::start_capture(function<void (const QString)> error_handler)
 {
-	if (sr_session_load(name.c_str()) != SR_OK) {
-		error_handler(tr("Failed to load file."));
+	stop_capture();
+
+	// Check that a device instance has been selected.
+	if (!device_) {
+		qDebug() << "No device selected";
 		return;
 	}
 
-	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+	// Check that at least one channel is enabled
+	auto channels = device_->channels();
+	bool enabled = std::any_of(channels.begin(), channels.end(),
+		[](shared_ptr<Channel> channel) { return channel->enabled(); });
 
-	if (sr_session_start() != SR_OK) {
-		error_handler(tr("Failed to start session."));
+	if (!enabled) {
+		error_handler(tr("No channels enabled."));
 		return;
 	}
 
-	set_capture_state(Running);
+	// Begin the session
+	sampling_thread_ = std::thread(
+		&SigSession::sample_thread_proc, this, device_,
+			error_handler);
+}
 
-	sr_session_run();
-	sr_session_destroy();
+void SigSession::stop_capture()
+{
+	if (get_capture_state() != Stopped)
+		session_->stop();
 
-	set_capture_state(Stopped);
+	// Check that sampling stopped
+	if (sampling_thread_.joinable())
+		sampling_thread_.join();
 }
 
-void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
-	uint64_t record_length,
-	function<void (const QString)> error_handler)
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
-	assert(sdi);
-	assert(error_handler);
+	shared_lock<shared_mutex> lock(signals_mutex_);
+	set< shared_ptr<data::SignalData> > data;
+	for (const shared_ptr<view::Signal> sig : signals_) {
+		assert(sig);
+		data.insert(sig->data());
+	}
 
-	sr_session_new();
-	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+	return data;
+}
 
-	if (sr_session_dev_add(sdi) != SR_OK) {
-		error_handler(tr("Failed to use device."));
-		sr_session_destroy();
-		return;
-	}
+boost::shared_mutex& SigSession::signals_mutex() const
+{
+	return signals_mutex_;
+}
 
-	// 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;
-	}
+const vector< shared_ptr<view::Signal> >& SigSession::signals() const
+{
+	return signals_;
+}
 
-	if (sr_session_start() != SR_OK) {
-		error_handler(tr("Failed to start session."));
-		return;
+#ifdef ENABLE_DECODE
+bool SigSession::add_decoder(srd_decoder *const dec)
+{
+	map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
+	shared_ptr<data::DecoderStack> decoder_stack;
+
+	try
+	{
+		lock_guard<boost::shared_mutex> lock(signals_mutex_);
+
+		// Create the decoder
+		decoder_stack = shared_ptr<data::DecoderStack>(
+			new data::DecoderStack(*this, dec));
+
+		// Make a list of all the channels
+		std::vector<const srd_channel*> all_channels;
+		for(const GSList *i = dec->channels; i; i = i->next)
+			all_channels.push_back((const srd_channel*)i->data);
+		for(const GSList *i = dec->opt_channels; i; i = i->next)
+			all_channels.push_back((const srd_channel*)i->data);
+
+		// Auto select the initial channels
+		for (const srd_channel *pdch : all_channels)
+			for (shared_ptr<view::Signal> s : signals_)
+			{
+				shared_ptr<view::LogicSignal> l =
+					dynamic_pointer_cast<view::LogicSignal>(s);
+				if (l && QString::fromUtf8(pdch->name).
+					toLower().contains(
+					l->name().toLower()))
+					channels[pdch] = l;
+			}
+
+		assert(decoder_stack);
+		assert(!decoder_stack->stack().empty());
+		assert(decoder_stack->stack().front());
+		decoder_stack->stack().front()->set_channels(channels);
+
+		// Create the decode signal
+		shared_ptr<view::DecodeTrace> d(
+			new view::DecodeTrace(*this, decoder_stack,
+				decode_traces_.size()));
+		decode_traces_.push_back(d);
+	}
+	catch(std::runtime_error e)
+	{
+		return false;
 	}
 
-	set_capture_state(Running);
+	signals_changed();
 
-	sr_session_run();
-	sr_session_destroy();
+	// Do an initial decode
+	decoder_stack->begin_decode();
 
-	set_capture_state(Stopped);
+	return true;
 }
 
-void SigSession::feed_in_header(const sr_dev_inst *sdi)
+vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
 {
-	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;
+	shared_lock<shared_mutex> lock(signals_mutex_);
+	return decode_traces_;
+}
 
-		case SR_PROBE_ANALOG:
-			analog_probe_count++;
-			break;
+void SigSession::remove_decode_signal(view::DecodeTrace *signal)
+{
+	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
+		if ((*i).get() == signal)
+		{
+			decode_traces_.erase(i);
+			signals_changed();
+			return;
 		}
-	}
+}
+#endif
 
-	// Read out the sample rate
-	assert(sdi->driver);
+void SigSession::set_capture_state(capture_state state)
+{
+	lock_guard<mutex> lock(sampling_mutex_);
+	const bool changed = capture_state_ != state;
+	capture_state_ = state;
+	if(changed)
+		capture_state_changed(state);
+}
 
-	const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-		&gvar, sdi);
-	if (ret != SR_OK) {
-		qDebug("Failed to get samplerate\n");
-		return;
-	}
+void SigSession::update_signals(shared_ptr<Device> device)
+{
+	assert(device);
+	assert(capture_state_ == Stopped);
 
-	sample_rate = g_variant_get_uint64(gvar);
-	g_variant_unref(gvar);
+	// Clear the decode traces
+	decode_traces_.clear();
 
-	// Create data containers for the coming data snapshots
-	{
-		lock_guard<mutex> data_lock(_data_mutex);
+	// Detect what data types we will receive
+	auto channels = device->channels();
+	unsigned int logic_channel_count = std::count_if(
+		channels.begin(), channels.end(),
+		[] (shared_ptr<Channel> channel) {
+			return channel->type() == ChannelType::LOGIC; });
 
-		if (logic_probe_count != 0) {
-			_logic_data.reset(new data::Logic(
-				logic_probe_count, sample_rate));
-			assert(_logic_data);
-		}
+	// Create data containers for the logic data snapshots
+	{
+		lock_guard<mutex> data_lock(data_mutex_);
 
-		if (analog_probe_count != 0) {
-			_analog_data.reset(new data::Analog(sample_rate));
-			assert(_analog_data);
+		logic_data_.reset();
+		if (logic_channel_count != 0) {
+			logic_data_.reset(new data::Logic(
+				logic_channel_count));
+			assert(logic_data_);
 		}
 	}
 
-	// Make the logic probe list
+	// Make the Signals list
 	{
-		lock_guard<mutex> lock(_signals_mutex);
+		unique_lock<shared_mutex> lock(signals_mutex_);
 
-		_signals.clear();
+		signals_.clear();
 
-		for (const GSList *l = sdi->probes; l; l = l->next) {
-			const sr_probe *const probe =
-				(const sr_probe *)l->data;
-			assert(probe);
-			if (!probe->enabled)
-				continue;
+		for (auto channel : device->channels()) {
+			shared_ptr<view::Signal> signal;
 
-			switch(probe->type) {
-			case SR_PROBE_LOGIC:
+			switch(channel->type()->id()) {
+			case SR_CHANNEL_LOGIC:
 				signal = shared_ptr<view::Signal>(
-					new view::LogicSignal(probe->name,
-						_logic_data, probe->index));
+					new view::LogicSignal(*this, device,
+						channel, logic_data_));
 				break;
 
-			case SR_PROBE_ANALOG:
+			case SR_CHANNEL_ANALOG:
+			{
+				shared_ptr<data::Analog> data(
+					new data::Analog());
 				signal = shared_ptr<view::Signal>(
-					new view::AnalogSignal(probe->name,
-						_analog_data, probe->index));
+					new view::AnalogSignal(
+						*this, channel, data));
 				break;
 			}
 
-			_signals.push_back(signal);
+			default:
+				assert(0);
+				break;
+			}
+
+			assert(signal);
+			signals_.push_back(signal);
 		}
 
-		signals_changed();
 	}
+
+	signals_changed();
+}
+
+shared_ptr<view::Signal> SigSession::signal_from_channel(
+	shared_ptr<Channel> channel) const
+{
+	lock_guard<boost::shared_mutex> lock(signals_mutex_);
+	for (shared_ptr<view::Signal> sig : signals_) {
+		assert(sig);
+		if (sig->channel() == channel)
+			return sig;
+	}
+	return shared_ptr<view::Signal>();
 }
 
-void SigSession::feed_in_meta(const sr_dev_inst *sdi,
-	const sr_datafeed_meta &meta)
+void SigSession::read_sample_rate(shared_ptr<Device> device)
 {
-	(void)sdi;
+	uint64_t sample_rate = VariantBase::cast_dynamic<Variant<guint64>>(
+		device->config_get(ConfigKey::SAMPLERATE)).get();
+
+	// Set the sample rate of all data
+	const set< shared_ptr<data::SignalData> > data_set = get_data();
+	for (shared_ptr<data::SignalData> data : data_set) {
+		assert(data);
+		data->set_samplerate(sample_rate);
+	}
+}
+
+void SigSession::sample_thread_proc(shared_ptr<Device> device,
+	function<void (const QString)> error_handler)
+{
+	assert(device);
+	assert(error_handler);
 
-	for (const GSList *l = meta.config; l; l = l->next) {
-		const sr_config *const src = (const sr_config*)l->data;
-		switch (src->key) {
+	read_sample_rate(device);
+
+	try {
+		session_->start();
+	} catch(Error e) {
+		error_handler(e.what());
+		return;
+	}
+
+	set_capture_state(session_->trigger() ?
+		AwaitingTrigger : Running);
+
+	session_->run();
+	set_capture_state(Stopped);
+
+	// Confirm that SR_DF_END was received
+	if (cur_logic_snapshot_)
+	{
+		qDebug("SR_DF_END was not received.");
+		assert(0);
+	}
+}
+
+void SigSession::feed_in_header(shared_ptr<Device> device)
+{
+	read_sample_rate(device);
+}
+
+void SigSession::feed_in_meta(shared_ptr<Device> device,
+	shared_ptr<Meta> meta)
+{
+	(void)device;
+
+	for (auto entry : meta->config()) {
+		switch (entry.first->id()) {
 		case SR_CONF_SAMPLERATE:
 			/// @todo handle samplerate changes
-			/// samplerate = (uint64_t *)src->value;
 			break;
 		default:
 			// Unknown metadata is not an error.
 			break;
 		}
 	}
+
+	signals_changed();
+}
+
+void SigSession::feed_in_frame_begin()
+{
+	if (cur_logic_snapshot_ || !cur_analog_snapshots_.empty())
+		frame_began();
 }
 
-void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
+void SigSession::feed_in_logic(shared_ptr<Logic> logic)
 {
-	lock_guard<mutex> lock(_data_mutex);
+	lock_guard<mutex> lock(data_mutex_);
 
-	if (!_logic_data)
+	if (!logic_data_)
 	{
 		qDebug() << "Unexpected logic packet";
 		return;
 	}
 
-	if (!_cur_logic_snapshot)
+	if (!cur_logic_snapshot_)
 	{
+		// This could be the first packet after a trigger
+		set_capture_state(Running);
+
+		// Get sample limit.
+		uint64_t sample_limit;
+		try {
+			sample_limit = VariantBase::cast_dynamic<Variant<guint64>>(
+				device_->config_get(ConfigKey::LIMIT_SAMPLES)).get();
+		} catch (Error) {
+			sample_limit = 0;
+		}
+
 		// Create a new data snapshot
-		_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
-			new data::LogicSnapshot(logic));
-		_logic_data->push_snapshot(_cur_logic_snapshot);
+		cur_logic_snapshot_ = shared_ptr<data::LogicSnapshot>(
+			new data::LogicSnapshot(logic, sample_limit));
+		logic_data_->push_snapshot(cur_logic_snapshot_);
+
+		// @todo Putting this here means that only listeners querying
+		// for logic will be notified. Currently the only user of
+		// frame_began is DecoderStack, but in future we need to signal
+		// this after both analog and logic sweeps have begun.
+		frame_began();
 	}
 	else
 	{
 		// Append to the existing data snapshot
-		_cur_logic_snapshot->append_payload(logic);
+		cur_logic_snapshot_->append_payload(logic);
 	}
 
-	data_updated();
+	data_received();
 }
 
-void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
+void SigSession::feed_in_analog(shared_ptr<Analog> analog)
 {
-	lock_guard<mutex> lock(_data_mutex);
+	lock_guard<mutex> lock(data_mutex_);
 
-	if(!_analog_data)
-	{
-		qDebug() << "Unexpected analog packet";
-		return;	// This analog packet was not expected.
-	}
+	const vector<shared_ptr<Channel>> channels = analog->channels();
+	const unsigned int channel_count = channels.size();
+	const size_t sample_count = analog->num_samples() / channel_count;
+	const float *data = analog->data_pointer();
+	bool sweep_beginning = false;
 
-	if (!_cur_analog_snapshot)
+	for (auto channel : channels)
 	{
-		// Create a new data snapshot
-		_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
-			new data::AnalogSnapshot(analog));
-		_analog_data->push_snapshot(_cur_analog_snapshot);
+		shared_ptr<data::AnalogSnapshot> snapshot;
+
+		// Try to get the snapshot of the channel
+		const map< shared_ptr<Channel>, shared_ptr<data::AnalogSnapshot> >::
+			iterator iter = cur_analog_snapshots_.find(channel);
+		if (iter != cur_analog_snapshots_.end())
+			snapshot = (*iter).second;
+		else
+		{
+			// If no snapshot was found, this means we havn't
+			// created one yet. i.e. this is the first packet
+			// in the sweep containing this snapshot.
+			sweep_beginning = true;
+
+			// Get sample limit.
+			uint64_t sample_limit;
+			try {
+				sample_limit = VariantBase::cast_dynamic<Variant<guint64>>(
+					device_->config_get(ConfigKey::LIMIT_SAMPLES)).get();
+			} catch (Error) {
+				sample_limit = 0;
+			}
+
+			// Create a snapshot, keep it in the maps of channels
+			snapshot = shared_ptr<data::AnalogSnapshot>(
+				new data::AnalogSnapshot(sample_limit));
+			cur_analog_snapshots_[channel] = snapshot;
+
+			// Find the annalog data associated with the channel
+			shared_ptr<view::AnalogSignal> sig =
+				dynamic_pointer_cast<view::AnalogSignal>(
+					signal_from_channel(channel));
+			assert(sig);
+
+			shared_ptr<data::Analog> data(sig->analog_data());
+			assert(data);
+
+			// Push the snapshot into the analog data.
+			data->push_snapshot(snapshot);
+		}
+
+		assert(snapshot);
+
+		// Append the samples in the snapshot
+		snapshot->append_interleaved_samples(data++, sample_count,
+			channel_count);
 	}
-	else
-	{
-		// Append to the existing data snapshot
-		_cur_analog_snapshot->append_payload(analog);
+
+	if (sweep_beginning) {
+		// This could be the first packet after a trigger
+		set_capture_state(Running);
 	}
 
-	data_updated();
+	data_received();
 }
 
-void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
-	const struct sr_datafeed_packet *packet)
+void SigSession::data_feed_in(shared_ptr<Device> device, shared_ptr<Packet> packet)
 {
-	assert(sdi);
+	assert(device);
 	assert(packet);
 
-	switch (packet->type) {
+	switch (packet->type()->id()) {
 	case SR_DF_HEADER:
-		feed_in_header(sdi);
+		feed_in_header(device);
 		break;
 
 	case SR_DF_META:
-		assert(packet->payload);
-		feed_in_meta(sdi,
-			*(const sr_datafeed_meta*)packet->payload);
+		feed_in_meta(device, dynamic_pointer_cast<Meta>(packet->payload()));
+		break;
+
+	case SR_DF_FRAME_BEGIN:
+		feed_in_frame_begin();
 		break;
 
 	case SR_DF_LOGIC:
-		assert(packet->payload);
-		feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
+		feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
 		break;
 
 	case SR_DF_ANALOG:
-		assert(packet->payload);
-		feed_in_analog(*(const sr_datafeed_analog*)packet->payload);
+		feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
 		break;
 
 	case SR_DF_END:
 	{
 		{
-			lock_guard<mutex> lock(_data_mutex);
-			_cur_logic_snapshot.reset();
-			_cur_analog_snapshot.reset();
+			lock_guard<mutex> lock(data_mutex_);
+			cur_logic_snapshot_.reset();
+			cur_analog_snapshots_.clear();
 		}
-		data_updated();
+		frame_ended();
 		break;
 	}
+	default:
+		break;
 	}
 }
 
-void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
-	const struct sr_datafeed_packet *packet, void *cb_data)
-{
-	(void) cb_data;
-	assert(_session);
-	_session->data_feed_in(sdi, packet);
-}
-
 } // namespace pv