projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added DevInst pointer to Signal
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 6f66be7c586be3958b6b08290829264e401997c3..a2f44dab1aaf01a462ef8383f83759f5b8147925 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-25,6
+25,7
@@
#include "sigsession.h"
#include "devicemanager.h"
#include "sigsession.h"
#include "devicemanager.h"
+#include "devinst.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
@@
-64,7
+65,6
@@
SigSession* SigSession::_session = NULL;
SigSession::SigSession(DeviceManager &device_manager) :
_device_manager(device_manager),
SigSession::SigSession(DeviceManager &device_manager) :
_device_manager(device_manager),
- _sdi(NULL),
_capture_state(Stopped)
{
// TODO: This should not be necessary
_capture_state(Stopped)
{
// TODO: This should not be necessary
@@
-77,39
+77,37
@@
SigSession::~SigSession()
_sampling_thread.join();
_sampling_thread.join();
- if (_sdi)
- _device_manager.release_device(_sdi);
- _sdi = NULL;
+ if (_dev_inst)
+ _device_manager.release_device(_dev_inst);
// TODO: This should not be necessary
_session = NULL;
}
// TODO: This should not be necessary
_session = NULL;
}
-s
truct sr_dev_inst*
SigSession::get_device() const
+s
hared_ptr<DevInst>
SigSession::get_device() const
{
{
- return _
sdi
;
+ return _
dev_inst
;
}
}
-void SigSession::set_device(s
truct sr_dev_inst *sdi
)
+void SigSession::set_device(s
hared_ptr<DevInst> dev_inst
)
{
// Ensure we are not capturing before setting the device
stop_capture();
{
// Ensure we are not capturing before setting the device
stop_capture();
- if (_
sdi
)
- _device_manager.release_device(_
sdi
);
- if (
sdi
)
- _device_manager.use_device(
sdi
, this);
- _
sdi = sdi
;
- update_signals(
sdi
);
+ if (_
dev_inst
)
+ _device_manager.release_device(_
dev_inst
);
+ if (
dev_inst
)
+ _device_manager.use_device(
dev_inst
, this);
+ _
dev_inst = dev_inst
;
+ update_signals(
dev_inst
);
}
}
-void SigSession::release_device(s
truct sr_dev_inst *sdi
)
+void SigSession::release_device(s
hared_ptr<DevInst> dev_inst
)
{
{
- (void)
sdi
;
+ (void)
dev_inst
;
assert(_capture_state == Stopped);
assert(_capture_state == Stopped);
- _sdi = NULL;
- update_signals(NULL);
+ _dev_inst = shared_ptr<DevInst>();
}
void SigSession::load_file(const string &name,
}
void SigSession::load_file(const string &name,
@@
-127,12
+125,13
@@
void SigSession::load_file(const string &name,
return;
}
return;
}
- sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+ shared_ptr<DevInst> dev_inst(
+ new DevInst((sr_dev_inst*)devlist->data));
g_slist_free(devlist);
_decode_traces.clear();
g_slist_free(devlist);
_decode_traces.clear();
- update_signals(
sdi
);
- read_sample_rate(
sdi
);
+ update_signals(
dev_inst
);
+ read_sample_rate(
dev_inst->dev_inst()
);
_sampling_thread = boost::thread(
&SigSession::load_session_thread_proc, this,
_sampling_thread = boost::thread(
&SigSession::load_session_thread_proc, this,
@@
-146,7
+145,7
@@
void SigSession::load_file(const string &name,
return;
_decode_traces.clear();
return;
_decode_traces.clear();
- update_signals(
in->sdi
);
+ update_signals(
shared_ptr<DevInst>(new DevInst(in->sdi))
);
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(
@@
-166,14
+165,16
@@
void SigSession::start_capture(function<void (const QString)> error_handler)
stop_capture();
// Check that a device instance has been selected.
stop_capture();
// Check that a device instance has been selected.
- if (!_
sdi
) {
+ if (!_
dev_inst
) {
qDebug() << "No device selected";
return;
}
qDebug() << "No device selected";
return;
}
+ assert(_dev_inst->dev_inst());
+
// 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 = _
dev_inst->dev_inst()
->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)
@@
-187,7
+188,8
@@
void SigSession::start_capture(function<void (const QString)> error_handler)
// Begin the session
_sampling_thread = boost::thread(
// Begin the session
_sampling_thread = boost::thread(
- &SigSession::sample_thread_proc, this, _sdi, error_handler);
+ &SigSession::sample_thread_proc, this, _dev_inst,
+ error_handler);
}
void SigSession::stop_capture()
}
void SigSession::stop_capture()
@@
-233,10
+235,15
@@
bool SigSession::add_decoder(srd_decoder *const dec)
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(dec));
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(dec));
- // Auto select the initial probes
+ // Make a list of all the probes
+ std::vector<const srd_probe*> all_probes;
for(const GSList *i = dec->probes; i; i = i->next)
for(const GSList *i = dec->probes; i; i = i->next)
- {
- const srd_probe *const probe = (const srd_probe*)i->data;
+ all_probes.push_back((const srd_probe*)i->data);
+ for(const GSList *i = dec->opt_probes; i; i = i->next)
+ all_probes.push_back((const srd_probe*)i->data);
+
+ // Auto select the initial probes
+ BOOST_FOREACH(const srd_probe *probe, all_probes)
BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
{
shared_ptr<view::LogicSignal> l =
BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
{
shared_ptr<view::LogicSignal> l =
@@
-246,7
+253,6
@@
bool SigSession::add_decoder(srd_decoder *const dec)
l->get_name().toLower()))
probes[probe] = l;
}
l->get_name().toLower()))
probes[probe] = l;
}
- }
assert(decoder_stack);
assert(!decoder_stack->stack().empty());
assert(decoder_stack);
assert(!decoder_stack->stack().empty());
@@
-378,8
+384,9
@@
sr_input* SigSession::load_input_file_format(const string &filename,
return in;
}
return in;
}
-void SigSession::update_signals(
const sr_dev_inst *const sdi
)
+void SigSession::update_signals(
shared_ptr<DevInst> dev_inst
)
{
{
+ assert(dev_inst);
assert(_capture_state == Stopped);
unsigned int logic_probe_count = 0;
assert(_capture_state == Stopped);
unsigned int logic_probe_count = 0;
@@
-388,8
+395,10
@@
void SigSession::update_signals(const sr_dev_inst *const sdi)
_decode_traces.clear();
// Detect what data types we will receive
_decode_traces.clear();
// Detect what data types we will receive
- if(sdi) {
- for (const GSList *l = sdi->probes; l; l = l->next) {
+ if(dev_inst) {
+ assert(dev_inst->dev_inst());
+ for (const GSList *l = dev_inst->dev_inst()->probes;
+ l; l = l->next) {
const sr_probe *const probe = (const sr_probe *)l->data;
if (!probe->enabled)
continue;
const sr_probe *const probe = (const sr_probe *)l->data;
if (!probe->enabled)
continue;
@@
-420,10
+429,12
@@
void SigSession::update_signals(const sr_dev_inst *const sdi)
_signals.clear();
_signals.clear();
- if(!
sdi
)
+ if(!
dev_inst
)
break;
break;
- for (const GSList *l = sdi->probes; l; l = l->next) {
+ assert(dev_inst->dev_inst());
+ for (const GSList *l = dev_inst->dev_inst()->probes;
+ l; l = l->next) {
shared_ptr<view::Signal> signal;
sr_probe *const probe = (sr_probe *)l->data;
assert(probe);
shared_ptr<view::Signal> signal;
sr_probe *const probe = (sr_probe *)l->data;
assert(probe);
@@
-431,8
+442,8
@@
void SigSession::update_signals(const sr_dev_inst *const sdi)
switch(probe->type) {
case SR_PROBE_LOGIC:
signal = shared_ptr<view::Signal>(
switch(probe->type) {
case SR_PROBE_LOGIC:
signal = shared_ptr<view::Signal>(
- new view::LogicSignal(*this,
probe
,
- _logic_data));
+ new view::LogicSignal(*this,
dev_inst
,
+
probe,
_logic_data));
break;
case SR_PROBE_ANALOG:
break;
case SR_PROBE_ANALOG:
@@
-440,8
+451,8
@@
void SigSession::update_signals(const sr_dev_inst *const sdi)
shared_ptr<data::Analog> data(
new data::Analog());
signal = shared_ptr<view::Signal>(
shared_ptr<data::Analog> data(
new data::Analog());
signal = shared_ptr<view::Signal>(
- new view::AnalogSignal(*this,
probe
,
- data));
+ new view::AnalogSignal(*this,
dev_inst
,
+
probe,
data));
break;
}
break;
}
@@
-461,8
+472,9
@@
void SigSession::update_signals(const sr_dev_inst *const sdi)
bool SigSession::is_trigger_enabled() const
{
bool SigSession::is_trigger_enabled() const
{
- assert(_sdi);
- for (const GSList *l = _sdi->probes; l; l = l->next) {
+ assert(_dev_inst);
+ assert(_dev_inst->dev_inst());
+ for (const GSList *l = _dev_inst->dev_inst()->probes; l; l = l->next) {
const sr_probe *const p = (const sr_probe *)l->data;
assert(p);
if (p->trigger && p->trigger[0] != '\0')
const sr_probe *const p = (const sr_probe *)l->data;
assert(p);
if (p->trigger && p->trigger[0] != '\0')
@@
-554,16
+566,17
@@
void SigSession::load_input_thread_proc(const string name,
delete in;
}
delete in;
}
-void SigSession::sample_thread_proc(s
truct sr_dev_inst *sdi
,
+void SigSession::sample_thread_proc(s
hared_ptr<DevInst> dev_inst
,
function<void (const QString)> error_handler)
{
function<void (const QString)> error_handler)
{
- assert(sdi);
+ assert(dev_inst);
+ assert(dev_inst->dev_inst());
assert(error_handler);
sr_session_new();
sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
assert(error_handler);
sr_session_new();
sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
- if (sr_session_dev_add(
sdi
) != SR_OK) {
+ if (sr_session_dev_add(
dev_inst->dev_inst()
) != SR_OK) {
error_handler(tr("Failed to use device."));
sr_session_destroy();
return;
error_handler(tr("Failed to use device."));
sr_session_destroy();
return;