using std::map;
using std::mutex;
using std::pair;
-using std::unordered_set;
using std::vector;
using std::shared_ptr;
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;
QString error_message() const;
const vector<data::DecodeChannel> get_channels() const;
- void auto_assign_signals();
+ void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
void assign_signal(const uint16_t channel_id, const SignalBase *signal);
int get_assigned_signal_count() const;
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_;
map<const decode::Row, decode::RowData> rows_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
- /**
- * This mutex prevents more than one thread from accessing
- * libsigrokdecode concurrently.
- * @todo A proper solution should be implemented to allow multiple
- * decode operations in parallel.
- */
- static mutex global_srd_mutex_;
-
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
bool frame_complete_;