aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/rfnoc
diff options
context:
space:
mode:
authorsteviez <steve.czabaniuk@ni.com>2020-04-09 11:20:35 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2020-04-13 07:19:12 -0500
commitb6ff5fd2837bed63b09798e4fa187b169b7dcdc2 (patch)
treebd232a2bca9f50cb12ade337466172d630f5f4f6 /host/lib/rfnoc
parent26ff29348931389f7c7e8d78bc4c3630dfc8d342 (diff)
downloaduhd-b6ff5fd2837bed63b09798e4fa187b169b7dcdc2.tar.gz
uhd-b6ff5fd2837bed63b09798e4fa187b169b7dcdc2.tar.bz2
uhd-b6ff5fd2837bed63b09798e4fa187b169b7dcdc2.zip
multi_usrp_rfnoc: Manually pass sample rate to ddc/duc
This adds (and calls) methods to manually pass radio block sample rate to the input/output properties of the ddc/duc during creation of the multi_usrp_rfnoc object. The ddc/duc require this information in order to return valid, possible output/input sample rates in get_rx_rates()/get_tx_rates(). Before, the ddc/duc wouldn't have this rate until the rfnoc_graph had been connected and committed, which happens in get_rx_stream()/get_tx_stream(). Thus, this fixes an issue where a user was unable to query possible sample rates prior to specifying a sample rate and creating a stream.
Diffstat (limited to 'host/lib/rfnoc')
-rw-r--r--host/lib/rfnoc/ddc_block_control.cpp5
-rw-r--r--host/lib/rfnoc/duc_block_control.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/host/lib/rfnoc/ddc_block_control.cpp b/host/lib/rfnoc/ddc_block_control.cpp
index 0522991ba..abf8d1f7b 100644
--- a/host/lib/rfnoc/ddc_block_control.cpp
+++ b/host/lib/rfnoc/ddc_block_control.cpp
@@ -136,6 +136,11 @@ public:
return _samp_rate_in.at(chan).is_valid() ? _samp_rate_in.at(chan).get() : 1.0;
}
+ void set_input_rate(const double rate, const size_t chan)
+ {
+ set_property<double>("samp_rate", rate, {res_source_info::INPUT_EDGE, chan});
+ }
+
double get_output_rate(const size_t chan) const
{
return _samp_rate_out.at(chan).is_valid() ? _samp_rate_out.at(chan).get() : 1.0;
diff --git a/host/lib/rfnoc/duc_block_control.cpp b/host/lib/rfnoc/duc_block_control.cpp
index 6b052e17a..5888e300e 100644
--- a/host/lib/rfnoc/duc_block_control.cpp
+++ b/host/lib/rfnoc/duc_block_control.cpp
@@ -138,6 +138,11 @@ public:
return _samp_rate_out.at(chan).is_valid() ? _samp_rate_out.at(chan).get() : 1.0;
}
+ void set_output_rate(const double rate, const size_t chan)
+ {
+ set_property<double>("samp_rate", rate, {res_source_info::OUTPUT_EDGE, chan});
+ }
+
uhd::meta_range_t get_input_rates(const size_t chan) const
{
uhd::meta_range_t result;