summaryrefslogtreecommitdiff
path: root/DSLogic-gui/pv/decoder/dsserial.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'DSLogic-gui/pv/decoder/dsserial.cpp')
-rw-r--r--DSLogic-gui/pv/decoder/dsserial.cpp16
1 files changed, 8 insertions, 8 deletions
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());