X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=c6995bcf703a56cb13b4ba347acb2c61aa11d17e;hp=d3e483bd8d0435ea0aea65ea3d1df0661d5e743e;hb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;hpb=943edd769f24a5a17df4f0b5e94d92b1b19c8300
diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index d3e483bd..c6995bcf 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,22 +14,23 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
-#include
+#include
+
+#include
#include
-#include "decoder.h"
+#include "decoder.hpp"
-#include
+#include
+#include
-using std::set;
+using pv::data::DecodeChannel;
using std::map;
-using std::shared_ptr;
using std::string;
namespace pv {
@@ -37,118 +38,131 @@ namespace data {
namespace decode {
Decoder::Decoder(const srd_decoder *const dec) :
- _decoder(dec),
- _shown(true)
+ decoder_(dec),
+ shown_(true),
+ decoder_inst_(nullptr)
{
}
Decoder::~Decoder()
{
- for (auto i = _options.begin(); i != _options.end(); i++)
- g_variant_unref((*i).second);
+ for (auto& option : options_)
+ g_variant_unref(option.second);
}
const srd_decoder* Decoder::decoder() const
{
- return _decoder;
+ return decoder_;
}
bool Decoder::shown() const
{
- return _shown;
+ return shown_;
}
void Decoder::show(bool show)
{
- _shown = show;
+ shown_ = show;
}
-const map >&
-Decoder::channels() const
+const vector& Decoder::channels() const
{
- return _probes;
+ return channels_;
}
-void Decoder::set_probes(std::map > probes)
+void Decoder::set_channels(vector channels)
{
- _probes = probes;
+ channels_ = channels;
}
-const std::map& Decoder::options() const
+const map& Decoder::options() const
{
- return _options;
+ return options_;
}
void Decoder::set_option(const char *id, GVariant *value)
{
assert(value);
g_variant_ref(value);
- _options[id] = value;
-}
+ options_[id] = value;
-bool Decoder::have_required_probes() const
-{
- for (GSList *l = _decoder->channels; l; l = l->next) {
- const srd_channel *const pdch = (const srd_channel*)l->data;
- assert(pdch);
- if (_probes.find(pdch) == _probes.end())
- return false;
- }
+ // If we have a decoder instance, apply option value immediately
+ if (decoder_inst_) {
+ GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
+ g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- return true;
+ g_variant_ref(value);
+ g_hash_table_insert(opt_hash, (void*)g_strdup(id), value);
+
+ srd_inst_option_set(decoder_inst_, opt_hash);
+ g_hash_table_destroy(opt_hash);
+ }
}
-set< shared_ptr > Decoder::get_data()
+bool Decoder::have_required_channels() const
{
- set< shared_ptr > data;
- for(auto i = _probes.cbegin(); i != _probes.cend(); i++) {
- shared_ptr signal((*i).second);
- assert(signal);
- data.insert(signal->logic_data());
- }
+ for (DecodeChannel *ch : channels_)
+ if (!ch->assigned_signal && !ch->is_optional)
+ return false;
- return data;
+ return true;
}
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)
{
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (auto i = _options.cbegin(); i != _options.cend(); i++)
- {
- GVariant *const value = (*i).second;
+ for (const auto& option : options_) {
+ GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
- (*i).first.c_str()), value);
+ option.first.c_str()), value);
}
- srd_decoder_inst *const decoder_inst = srd_inst_new(
- session, _decoder->id, opt_hash);
+ if (decoder_inst_)
+ qDebug() << "WARNING: previous decoder instance" << decoder_inst_ << "exists";
+
+ decoder_inst_ = srd_inst_new(session, decoder_->id, opt_hash);
g_hash_table_destroy(opt_hash);
- if(!decoder_inst)
- return NULL;
+ if (!decoder_inst_)
+ return nullptr;
+
+ // Setup the channels
+ GArray *const init_pin_states = g_array_sized_new(false, true,
+ sizeof(uint8_t), channels_.size());
- // Setup the probes
- GHashTable *const probes = g_hash_table_new_full(g_str_hash,
+ g_array_set_size(init_pin_states, channels_.size());
+
+ GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(auto i = _probes.cbegin(); i != _probes.cend(); i++)
- {
- shared_ptr signal((*i).second);
- GVariant *const gvar = g_variant_new_int32(
- signal->probe()->index);
+ for (DecodeChannel *ch : channels_) {
+ if (!ch->assigned_signal)
+ continue;
+
+ init_pin_states->data[ch->id] = ch->initial_pin_state;
+
+ GVariant *const gvar = g_variant_new_int32(ch->bit_id); // bit_id = bit position
g_variant_ref_sink(gvar);
- g_hash_table_insert(probes, (*i).first->id, gvar);
+ // key is channel name (pdch->id), value is bit position in each sample (gvar)
+ g_hash_table_insert(channels, ch->pdch_->id, gvar);
}
- srd_inst_channel_set_all(decoder_inst, probes, unit_size);
+ srd_inst_channel_set_all(decoder_inst_, channels);
+
+ srd_inst_initial_pins_set_all(decoder_inst_, init_pin_states);
+ g_array_free(init_pin_states, true);
- return decoder_inst;
+ return decoder_inst_;
+}
+
+void Decoder::invalidate_decoder_inst()
+{
+ decoder_inst_ = nullptr;
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv