* 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>
using std::set;
using std::map;
shown_ = show;
}
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+const map<const srd_channel*, shared_ptr<data::SignalBase> >&
Decoder::channels() const
{
return channels_;
}
-void Decoder::set_channels(std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+ shared_ptr<data::SignalBase> > channels)
{
channels_ = channels;
}
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
{
return options_;
}
{
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());
+ shared_ptr<data::SignalBase> b(channel.second);
+ assert(b);
+ data.insert(b->logic_data());
}
return data;
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->base()->index());
+ shared_ptr<data::SignalBase> b(channel.second);
+
+// init_pin_states->data[pdch->order] =
+// channel.initial_pin_state;
+
+ GVariant *const gvar = g_variant_new_int32(b->index());
g_variant_ref_sink(gvar);
g_hash_table_insert(channels, channel.first->id, gvar);
}
srd_inst_channel_set_all(decoder_inst, channels);
+// srd_inst_initial_pins_set_all(decoder_inst, initial_pin_states);
+ g_array_free(init_pin_states, TRUE);
+
return decoder_inst;
}
-} // decode
-} // data
-} // pv
+} // namespace decode
+} // namespace data
+} // namespace pv