projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename DecodeSignal::segment_ to logic_mux_segment_ for clarity
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 3d90f7f7de648e861d117fc24e8b1200b44fe952..747a16dcd16b9865e94fd70162a218eddd784f99 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-40,7
+40,6
@@
using std::condition_variable;
using std::map;
using std::mutex;
using std::pair;
using std::map;
using std::mutex;
using std::pair;
-using std::unordered_set;
using std::vector;
using std::shared_ptr;
using std::vector;
using std::shared_ptr;
@@
-62,7
+61,8
@@
class SignalData;
struct DecodeChannel
{
struct DecodeChannel
{
- uint16_t id; // Also tells which bit within a sample represents this channel
+ uint16_t id; ///< Global numerical ID for the decode channels in the stack
+ uint16_t bit_id; ///< Tells which bit within a sample represents this channel
const bool is_optional;
const pv::data::SignalBase *assigned_signal;
const QString name, desc;
const bool is_optional;
const pv::data::SignalBase *assigned_signal;
const QString name, desc;
@@
-168,7
+168,7
@@
private:
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
- shared_ptr<LogicSegment> segment_;
+ shared_ptr<LogicSegment>
logic_mux_
segment_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;