projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected project name in header comments
[pulseview.git]
/
sigsession.cpp
diff --git
a/sigsession.cpp
b/sigsession.cpp
index aecd21c2c3b5c5231c9407156edd24cad52acfc0..ac96833f842d5df0cdad4d470e26a8cc6b65144b 100644
(file)
--- a/
sigsession.cpp
+++ b/
sigsession.cpp
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-32,25
+32,25
@@
using namespace boost;
using namespace std;
// TODO: This should not be necessary
using namespace std;
// TODO: This should not be necessary
-SigSession* SigSession::session = NULL;
+SigSession* SigSession::
_
session = NULL;
SigSession::SigSession()
{
// TODO: This should not be necessary
SigSession::SigSession()
{
// TODO: This should not be necessary
- session = this;
+
_
session = this;
}
SigSession::~SigSession()
{
// TODO: This should not be necessary
}
SigSession::~SigSession()
{
// TODO: This should not be necessary
- session = NULL;
+
_
session = NULL;
}
}
-void SigSession::load
F
ile(const std::string &name)
+void SigSession::load
_f
ile(const std::string &name)
{
if (sr_session_load(name.c_str()) == SR_OK) {
/* sigrok session file */
{
if (sr_session_load(name.c_str()) == SR_OK) {
/* sigrok session file */
- sr_session_datafeed_callback_add(data
FeedInP
roc);
+ sr_session_datafeed_callback_add(data
_feed_in_p
roc);
sr_session_start();
sr_session_run();
sr_session_stop();
sr_session_start();
sr_session_run();
sr_session_stop();
@@
-58,10
+58,10
@@
void SigSession::loadFile(const std::string &name)
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
- uint64_t sample_rate)
+ uint64_t
record_length, uint64_t
sample_rate)
{
sr_session_new();
{
sr_session_new();
- sr_session_datafeed_callback_add(data
FeedInP
roc);
+ sr_session_datafeed_callback_add(data
_feed_in_p
roc);
if (sr_session_dev_add(sdi) != SR_OK) {
qDebug() << "Failed to use device.";
if (sr_session_dev_add(sdi) != SR_OK) {
qDebug() << "Failed to use device.";
@@
-69,9
+69,8
@@
void SigSession::start_capture(struct sr_dev_inst *sdi,
return;
}
return;
}
- uint64_t limit_samples = 10000;
if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
- &
limit_samples
) != SR_OK) {
+ &
record_length
) != SR_OK) {
qDebug() << "Failed to configure time-based sample limit.";
sr_session_destroy();
return;
qDebug() << "Failed to configure time-based sample limit.";
sr_session_destroy();
return;
@@
-98,7
+97,12
@@
vector< shared_ptr<Signal> >& SigSession::get_signals()
return _signals;
}
return _signals;
}
-void SigSession::dataFeedIn(const struct sr_dev_inst *sdi,
+boost::shared_ptr<LogicData> SigSession::get_data()
+{
+ return _logic_data;
+}
+
+void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet)
{
assert(sdi);
struct sr_datafeed_packet *packet)
{
assert(sdi);
@@
-163,14
+167,14
@@
void SigSession::dataFeedIn(const struct sr_dev_inst *sdi,
case SR_DF_END:
_cur_logic_snapshot.reset();
case SR_DF_END:
_cur_logic_snapshot.reset();
- data
U
pdated();
+ data
_u
pdated();
break;
}
}
break;
}
}
-void SigSession::data
FeedInP
roc(const struct sr_dev_inst *sdi,
+void SigSession::data
_feed_in_p
roc(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet)
{
struct sr_datafeed_packet *packet)
{
- assert(session);
-
session->dataFeedI
n(sdi, packet);
+ assert(
_
session);
+
_session->data_feed_i
n(sdi, packet);
}
}