X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=2a9b980b14ef58039641f22df519cb291b6acdb7;hb=762ab7a4b20928a784b2b3400ce748d901e32d2d;hp=1513b20be5cb70156db3dfe33c43c8c0e4fd594b;hpb=27c0521002ea986b72d9675b99803665516db14c;p=pulseview.git
diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 1513b20..2a9b980 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,8 +14,7 @@
* 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
@@ -25,8 +24,10 @@
#include "decoder.hpp"
-#include
+#include
+#include
+using pv::data::DecodeChannel;
using std::set;
using std::map;
using std::shared_ptr;
@@ -63,19 +64,17 @@ void Decoder::show(bool show)
shown_ = show;
}
-const map >&
-Decoder::channels() const
+const vector& Decoder::channels() const
{
return channels_;
}
-void Decoder::set_channels(std::map > channels)
+void Decoder::set_channels(vector channels)
{
channels_ = channels;
}
-const std::map& Decoder::options() const
+const map& Decoder::options() const
{
return options_;
}
@@ -89,28 +88,13 @@ void Decoder::set_option(const char *id, GVariant *value)
bool Decoder::have_required_channels() const
{
- for (GSList *l = decoder_->channels; l; l = l->next) {
- const srd_channel *const pdch = (const srd_channel*)l->data;
- assert(pdch);
- if (channels_.find(pdch) == channels_.end())
+ for (DecodeChannel *ch : channels_)
+ if (!ch->assigned_signal && !ch->is_optional)
return false;
- }
return true;
}
-set< shared_ptr > Decoder::get_data()
-{
- set< shared_ptr > data;
- for (const auto& channel : channels_) {
- shared_ptr signal(channel.second);
- assert(signal);
- data.insert(signal->logic_data());
- }
-
- return data;
-}
-
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
{
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
@@ -131,22 +115,31 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
return nullptr;
// Setup the channels
+ GArray *const init_pin_states = g_array_sized_new(FALSE, TRUE,
+ sizeof(uint8_t), channels_.size());
+
+ 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 (const auto& channel : channels_) {
- shared_ptr signal(channel.second);
- GVariant *const gvar = g_variant_new_int32(
- signal->channel()->index());
+ for (DecodeChannel *ch : channels_) {
+ init_pin_states->data[ch->id] = ch->initial_pin_state;
+
+ GVariant *const gvar = g_variant_new_int32(ch->id); // id = bit position
g_variant_ref_sink(gvar);
- g_hash_table_insert(channels, channel.first->id, gvar);
+ // key is channel name, value is bit position in each sample
+ g_hash_table_insert(channels, ch->pdch_->id, gvar);
}
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;
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv