projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Open/close devices as needed
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index a611e7ac7c14159eed9d8e4c569e2a8b79bb9880..c5a7d494ecf8ed55237b4c440bd3f4497e72c398 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-29,6
+29,8
@@
#include <assert.h>
#include <assert.h>
+#include <QDebug>
+
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-38,6
+40,7
@@
namespace pv {
SigSession* SigSession::_session = NULL;
SigSession::SigSession() :
SigSession* SigSession::_session = NULL;
SigSession::SigSession() :
+ _sdi(NULL),
_capture_state(Stopped)
{
// TODO: This should not be necessary
_capture_state(Stopped)
{
// TODO: This should not be necessary
@@
-56,6
+59,15
@@
SigSession::~SigSession()
_session = NULL;
}
_session = NULL;
}
+void SigSession::set_device(struct sr_dev_inst *sdi)
+{
+ if (_sdi)
+ sr_dev_close(_sdi);
+ if (sdi)
+ sr_dev_open(sdi);
+ _sdi = sdi;
+}
+
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
@@
-71,15
+83,20
@@
SigSession::capture_state SigSession::get_capture_state() const
return _capture_state;
}
return _capture_state;
}
-void SigSession::start_capture(struct sr_dev_inst *sdi,
- uint64_t record_length,
+void SigSession::start_capture(uint64_t record_length,
function<void (const QString)> error_handler)
{
stop_capture();
function<void (const QString)> error_handler)
{
stop_capture();
+ // Check that a device instance has been selected.
+ if (!_sdi) {
+ qDebug() << "No device selected";
+ return;
+ }
+
// Check that at least one probe is enabled
const GSList *l;
// Check that at least one probe is enabled
const GSList *l;
- for (l = sdi->probes; l; l = l->next) {
+ for (l =
_
sdi->probes; l; l = l->next) {
sr_probe *const probe = (sr_probe*)l->data;
assert(probe);
if (probe->enabled)
sr_probe *const probe = (sr_probe*)l->data;
assert(probe);
if (probe->enabled)
@@
-93,7
+110,7
@@
void SigSession::start_capture(struct sr_dev_inst *sdi,
// Begin the session
_sampling_thread.reset(new boost::thread(
// Begin the session
_sampling_thread.reset(new boost::thread(
- &SigSession::sample_thread_proc, this, sdi,
+ &SigSession::sample_thread_proc, this,
_
sdi,
record_length, error_handler));
}
record_length, error_handler));
}
@@
-136,7
+153,7
@@
void SigSession::load_thread_proc(const string name,
return;
}
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) {
error_handler(tr("Failed to start session."));
if (sr_session_start() != SR_OK) {
error_handler(tr("Failed to start session."));
@@
-146,7
+163,7
@@
void SigSession::load_thread_proc(const string name,
set_capture_state(Running);
sr_session_run();
set_capture_state(Running);
sr_session_run();
- sr_session_
stop
();
+ sr_session_
destroy
();
set_capture_state(Stopped);
}
set_capture_state(Stopped);
}
@@
-159,7
+176,7
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
assert(error_handler);
sr_session_new();
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) {
error_handler(tr("Failed to use device."));
if (sr_session_dev_add(sdi) != SR_OK) {
error_handler(tr("Failed to use device."));
@@
-169,7
+186,7
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
// Set the sample limit
if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
// Set the sample limit
if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
-
&record_length
) != SR_OK) {
+
g_variant_new_uint64(record_length)
) != SR_OK) {
error_handler(tr("Failed to configure "
"time-based sample limit."));
sr_session_destroy();
error_handler(tr("Failed to configure "
"time-based sample limit."));
sr_session_destroy();
@@
-192,7
+209,8
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
shared_ptr<view::Signal> signal;
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
shared_ptr<view::Signal> signal;
- uint64_t *sample_rate = NULL;
+ GVariant *gvar;
+ uint64_t sample_rate = 0;
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
@@
-217,8
+235,14
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
assert(sdi->driver);
const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
assert(sdi->driver);
const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
- (const void**)&sample_rate, sdi);
- assert(ret == SR_OK);
+ &gvar, sdi);
+ if (ret != SR_OK) {
+ qDebug("Failed to get samplerate\n");
+ return;
+ }
+
+ sample_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
// Create data containers for the coming data snapshots
{
// Create data containers for the coming data snapshots
{
@@
-226,12
+250,12
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
if (logic_probe_count != 0) {
_logic_data.reset(new data::Logic(
if (logic_probe_count != 0) {
_logic_data.reset(new data::Logic(
- logic_probe_count,
*
sample_rate));
+ logic_probe_count, sample_rate));
assert(_logic_data);
}
if (analog_probe_count != 0) {
assert(_logic_data);
}
if (analog_probe_count != 0) {
- _analog_data.reset(new data::Analog(
*
sample_rate));
+ _analog_data.reset(new data::Analog(sample_rate));
assert(_analog_data);
}
}
assert(_analog_data);
}
}
@@
-259,7
+283,7
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
case SR_PROBE_ANALOG:
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(probe->name,
case SR_PROBE_ANALOG:
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(probe->name,
- _analog_data));
+ _analog_data
, probe->index
));
break;
}
break;
}
@@
-292,10
+316,15
@@
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
{
lock_guard<mutex> lock(_data_mutex);
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
{
lock_guard<mutex> lock(_data_mutex);
- if (!_cur_logic_snapshot)
+
+ if (!_logic_data)
{
{
- assert(_logic_data);
+ qDebug() << "Unexpected logic packet";
+ return;
+ }
+ if (!_cur_logic_snapshot)
+ {
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
@@
-313,10
+342,15
@@
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
- if (!_cur_analog_snapshot)
+
+ if(!_analog_data)
{
{
- assert(_analog_data);
+ qDebug() << "Unexpected analog packet";
+ return; // This analog packet was not expected.
+ }
+ if (!_cur_analog_snapshot)
+ {
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));
@@
-372,8
+406,9
@@
void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
}
void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
}
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);
}
assert(_session);
_session->data_feed_in(sdi, packet);
}