* 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 <http://www.gnu.org/licenses/>.
*/
#include <cassert>
#include "decoder.hpp"
-#include <pv/view/logicsignal.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/data/decodesignal.hpp>
-using std::set;
+using pv::data::DecodeChannel;
using std::map;
-using std::shared_ptr;
using std::string;
namespace pv {
Decoder::~Decoder()
{
- for (auto & option : options_)
+ for (auto& option : options_)
g_variant_unref(option.second);
}
shown_ = show;
}
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
-Decoder::channels() const
+const vector<DecodeChannel*>& Decoder::channels() const
{
return channels_;
}
-void Decoder::set_channels(std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> > channels)
+void Decoder::set_channels(vector<DecodeChannel*> channels)
{
channels_ = channels;
}
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
{
return options_;
}
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<pv::data::Logic> > Decoder::get_data()
-{
- set< shared_ptr<pv::data::Logic> > data;
- for (const auto & channel : channels_) {
- shared_ptr<view::LogicSignal> 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,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (const auto & option : options_) {
+ for (const auto& option : options_) {
GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
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<view::LogicSignal> signal(channel.second);
- GVariant *const gvar = g_variant_new_int32(
- signal->channel()->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(channels, channel.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, 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