From 75a090543b8fb8e7c875387eee6d3fe7227e4450 Mon Sep 17 00:00:00 2001 From: Ciro Nishiguchi Date: Thu, 23 May 2019 20:38:07 -0500 Subject: rfnoc: add rx and tx transports, and amend rfnoc_graph transports: Transports build on I/O service and implements flow control and sequence number checking. The rx streamer subclass extends the streamer implementation to connect it to the rfnoc graph. It receives configuration values from property propagation and configures the streamer accordingly. It also implements the issue_stream_cmd rx_streamer API method. Add implementation of rx streamer creation and method to connect it to an rfnoc block. rfnoc_graph: Cache more connection info, clarify contract Summary of changes: - rfnoc_graph stores more information about static connections at the beginning. Some search algorithms are replaced by simpler lookups. - The contract for connect() was clarified. It is required to call connect, even for static connections. --- host/lib/rfnoc/rfnoc_tx_streamer.cpp | 124 +++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 host/lib/rfnoc/rfnoc_tx_streamer.cpp (limited to 'host/lib/rfnoc/rfnoc_tx_streamer.cpp') diff --git a/host/lib/rfnoc/rfnoc_tx_streamer.cpp b/host/lib/rfnoc/rfnoc_tx_streamer.cpp new file mode 100644 index 000000000..82feeaf1f --- /dev/null +++ b/host/lib/rfnoc/rfnoc_tx_streamer.cpp @@ -0,0 +1,124 @@ +// +// Copyright 2019 Ettus Research, a National Instruments Brand +// +// SPDX-License-Identifier: GPL-3.0-or-later +// + +#include +#include +#include +#include + +using namespace uhd; +using namespace uhd::rfnoc; + +const std::string STREAMER_ID = "TxStreamer"; +static std::atomic streamer_inst_ctr; + +rfnoc_tx_streamer::rfnoc_tx_streamer(const size_t num_chans, + const uhd::stream_args_t stream_args) + : tx_streamer_impl(num_chans, stream_args) + , _unique_id(STREAMER_ID + "#" + std::to_string(streamer_inst_ctr++)) + , _stream_args(stream_args) +{ + // No block to which to forward properties or actions + set_prop_forwarding_policy(forwarding_policy_t::DROP); + set_action_forwarding_policy(forwarding_policy_t::DROP); + + // Initialize properties + _scaling_out.reserve(num_chans); + _samp_rate_out.reserve(num_chans); + _tick_rate_out.reserve(num_chans); + _type_out.reserve(num_chans); + + for (size_t i = 0; i < num_chans; i++) { + _register_props(i, stream_args.otw_format); + } + + node_accessor_t node_accessor; + node_accessor.init_props(this); +} + +std::string rfnoc_tx_streamer::get_unique_id() const +{ + return _unique_id; +} + +size_t rfnoc_tx_streamer::get_num_input_ports() const +{ + return 0; +} + +size_t rfnoc_tx_streamer::get_num_output_ports() const +{ + return get_num_channels(); +} + +const uhd::stream_args_t& rfnoc_tx_streamer::get_stream_args() const +{ + return _stream_args; +} + +bool rfnoc_tx_streamer::check_topology( + const std::vector& connected_inputs, + const std::vector& connected_outputs) +{ + // Check that all channels are connected + if (connected_outputs.size() != get_num_output_ports()) { + return false; + } + + // Call base class to check that connections are valid + return node_t::check_topology(connected_inputs, connected_outputs); +} + +void rfnoc_tx_streamer::_register_props(const size_t chan, + const std::string& otw_format) +{ + // Create actual properties and store them + _scaling_out.push_back(property_t( + PROP_KEY_SCALING, {res_source_info::OUTPUT_EDGE, chan})); + _samp_rate_out.push_back(property_t( + PROP_KEY_SAMP_RATE, {res_source_info::OUTPUT_EDGE, chan})); + _tick_rate_out.push_back(property_t( + PROP_KEY_TICK_RATE, {res_source_info::OUTPUT_EDGE, chan})); + _type_out.emplace_back(property_t( + PROP_KEY_TYPE, otw_format, {res_source_info::OUTPUT_EDGE, chan})); + + // Give us some shorthands for the rest of this function + property_t* scaling_out = &_scaling_out.back(); + property_t* samp_rate_out = &_samp_rate_out.back(); + property_t* tick_rate_out = &_tick_rate_out.back(); + property_t* type_out = &_type_out.back(); + + // Register them + register_property(scaling_out); + register_property(samp_rate_out); + register_property(tick_rate_out); + register_property(type_out); + + // Add resolvers + add_property_resolver({scaling_out}, {}, + [&scaling_out = *scaling_out, chan, this]() { + RFNOC_LOG_TRACE("Calling resolver for `scaling_out'@" << chan); + if (scaling_out.is_valid()) { + this->set_scale_factor(chan, 32767.0 / scaling_out.get()); + } + }); + + add_property_resolver({samp_rate_out}, {}, + [&samp_rate_out = *samp_rate_out, chan, this]() { + RFNOC_LOG_TRACE("Calling resolver for `samp_rate_out'@" << chan); + if (samp_rate_out.is_valid()) { + this->set_samp_rate(samp_rate_out.get()); + } + }); + + add_property_resolver({tick_rate_out}, {}, + [&tick_rate_out = *tick_rate_out, chan, this]() { + RFNOC_LOG_TRACE("Calling resolver for `tick_rate_out'@" << chan); + if (tick_rate_out.is_valid()) { + this->set_tick_rate(tick_rate_out.get()); + } + }); +} -- cgit v1.2.3