summaryrefslogtreecommitdiff
path: root/DSLogic-gui/pv/decoder
diff options
context:
space:
mode:
Diffstat (limited to 'DSLogic-gui/pv/decoder')
-rw-r--r--DSLogic-gui/pv/decoder/ds1wire.cpp10
-rw-r--r--DSLogic-gui/pv/decoder/dsdmx512.cpp10
-rw-r--r--DSLogic-gui/pv/decoder/dsi2c.cpp12
-rw-r--r--DSLogic-gui/pv/decoder/dsserial.cpp16
-rw-r--r--DSLogic-gui/pv/decoder/dsspi.cpp12
5 files changed, 30 insertions, 30 deletions
diff --git a/DSLogic-gui/pv/decoder/ds1wire.cpp b/DSLogic-gui/pv/decoder/ds1wire.cpp
index 1f8d759..04d3ec3 100644
--- a/DSLogic-gui/pv/decoder/ds1wire.cpp
+++ b/DSLogic-gui/pv/decoder/ds1wire.cpp
@@ -53,7 +53,7 @@ const QString ds1Wire::StateTable[TableSize] = {
"DATA"
};
-ds1Wire::ds1Wire(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+ds1Wire::ds1Wire(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
Decoder(data, _sel_probes, _options_index)
{
(void)_options;
@@ -91,12 +91,12 @@ void ds1Wire::decode()
_max_width = 0;
uint8_t cur_state = Unknown;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
uint64_t flag_index1;
@@ -336,11 +336,11 @@ void ds1Wire::get_subsampled_states(std::vector<struct ds_view_state> &states,
{
ds_view_state view_state;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
assert(end <= snapshot->get_sample_count());
diff --git a/DSLogic-gui/pv/decoder/dsdmx512.cpp b/DSLogic-gui/pv/decoder/dsdmx512.cpp
index 19894ec..846f283 100644
--- a/DSLogic-gui/pv/decoder/dsdmx512.cpp
+++ b/DSLogic-gui/pv/decoder/dsdmx512.cpp
@@ -53,7 +53,7 @@ const QString dsDmx512::StateTable[TableSize] = {
"SLOT"
};
-dsDmx512::dsDmx512(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+dsDmx512::dsDmx512(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
Decoder(data, _sel_probes, _options_index)
{
(void)_options;
@@ -91,12 +91,12 @@ void dsDmx512::decode()
_max_width = 0;
uint8_t cur_state = Unknown;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
//uint64_t flag_index;
@@ -261,11 +261,11 @@ void dsDmx512::get_subsampled_states(std::vector<struct ds_view_state> &states,
{
ds_view_state view_state;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
assert(end <= snapshot->get_sample_count());
diff --git a/DSLogic-gui/pv/decoder/dsi2c.cpp b/DSLogic-gui/pv/decoder/dsi2c.cpp
index 9f61b86..b2bc440 100644
--- a/DSLogic-gui/pv/decoder/dsi2c.cpp
+++ b/DSLogic-gui/pv/decoder/dsi2c.cpp
@@ -52,7 +52,7 @@ const QString dsI2c::StateTable[TableSize] = {
"DATA"
};
-dsI2c::dsI2c(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+dsI2c::dsI2c(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
Decoder(data, _sel_probes, _options_index)
{
(void)_options;
@@ -91,12 +91,12 @@ void dsI2c::decode()
_max_width = 0;
uint8_t cur_state = Unknown;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
uint64_t flag_index;
@@ -185,7 +185,7 @@ void dsI2c::cmd_decode(const boost::shared_ptr<data::LogicSnapshot> &snapshot)
}
}
-void dsI2c::data_decode(const shared_ptr<data::LogicSnapshot> &snapshot)
+void dsI2c::data_decode(const boost::shared_ptr<data::LogicSnapshot> &snapshot)
{
uint8_t cur_state;
const uint8_t *src_ptr;
@@ -246,11 +246,11 @@ void dsI2c::get_subsampled_states(std::vector<struct ds_view_state> &states,
{
ds_view_state view_state;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
assert(end <= snapshot->get_sample_count());
diff --git a/DSLogic-gui/pv/decoder/dsserial.cpp b/DSLogic-gui/pv/decoder/dsserial.cpp
index 5b23186..aee9a4c 100644
--- a/DSLogic-gui/pv/decoder/dsserial.cpp
+++ b/DSLogic-gui/pv/decoder/dsserial.cpp
@@ -53,7 +53,7 @@ const QString dsSerial::StateTable[TableSize] = {
"DATA"
};
-dsSerial::dsSerial(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+dsSerial::dsSerial(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
Decoder(data, _sel_probes, _options_index)
{
assert(_sel_probes.size() == 1);
@@ -102,12 +102,12 @@ void dsSerial::decode()
assert(_data);
uint8_t cur_state = Unknown;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
uint64_t flag_index;
@@ -117,7 +117,7 @@ void dsSerial::decode()
uint64_t left = 0;
uint64_t right = snapshot->get_sample_count() - 1;
float samplesPerBit;
- int sampleOffset;
+ //int sampleOffset;
int i;
_max_width = 0;
_min_width = right;
@@ -127,7 +127,7 @@ void dsSerial::decode()
samplesPerBit = _data->get_samplerate() * 1.0f / _baudrate;
else
samplesPerBit = snapshot->get_min_pulse(left, right, _serial_index);
- sampleOffset = samplesPerBit / 2;
+ //sampleOffset = samplesPerBit / 2;
if (!_state_index.empty())
_state_index.clear();
@@ -174,7 +174,7 @@ void dsSerial::decode()
}
-void dsSerial::data_decode(const shared_ptr<data::LogicSnapshot> &snapshot, uint64_t start, uint64_t stop, float samplesPerBit)
+void dsSerial::data_decode(const boost::shared_ptr<data::LogicSnapshot> &snapshot, uint64_t start, uint64_t stop, float samplesPerBit)
{
(void)stop;
@@ -238,11 +238,11 @@ void dsSerial::get_subsampled_states(std::vector<struct ds_view_state> &states,
{
ds_view_state view_state;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
assert(end <= snapshot->get_sample_count());
diff --git a/DSLogic-gui/pv/decoder/dsspi.cpp b/DSLogic-gui/pv/decoder/dsspi.cpp
index 88ff8db..3b95507 100644
--- a/DSLogic-gui/pv/decoder/dsspi.cpp
+++ b/DSLogic-gui/pv/decoder/dsspi.cpp
@@ -45,7 +45,7 @@ const QString dsSpi::StateTable[TableSize] = {
"DATA"
};
-dsSpi::dsSpi(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+dsSpi::dsSpi(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
Decoder(data, _sel_probes, _options_index)
{
_cpol = _options.value("cpol").toBool();
@@ -125,12 +125,12 @@ void dsSpi::decode()
_max_width = 0;
uint8_t cur_state = Unknown;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
const uint64_t ssn_mask = 1ULL << _ssn_index;
@@ -191,7 +191,7 @@ void dsSpi::decode()
}
}
-void dsSpi::data_decode(const shared_ptr<data::LogicSnapshot> &snapshot)
+void dsSpi::data_decode(const boost::shared_ptr<data::LogicSnapshot> &snapshot)
{
uint8_t cur_state;
const uint8_t *src_ptr;
@@ -256,11 +256,11 @@ void dsSpi::get_subsampled_states(std::vector<struct ds_view_state> &states,
{
ds_view_state view_state;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+ const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+ const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
assert(end <= snapshot->get_sample_count());
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-07 12:15:28 +0000