diff options
author | steviez <steve.czabaniuk@ni.com> | 2020-04-09 11:20:35 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-04-13 07:19:12 -0500 |
commit | b6ff5fd2837bed63b09798e4fa187b169b7dcdc2 (patch) | |
tree | bd232a2bca9f50cb12ade337466172d630f5f4f6 /host/include | |
parent | 26ff29348931389f7c7e8d78bc4c3630dfc8d342 (diff) | |
download | uhd-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/include')
-rw-r--r-- | host/include/uhd/rfnoc/ddc_block_control.hpp | 7 | ||||
-rw-r--r-- | host/include/uhd/rfnoc/duc_block_control.hpp | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/host/include/uhd/rfnoc/ddc_block_control.hpp b/host/include/uhd/rfnoc/ddc_block_control.hpp index 88c7ce106..f4197dd55 100644 --- a/host/include/uhd/rfnoc/ddc_block_control.hpp +++ b/host/include/uhd/rfnoc/ddc_block_control.hpp @@ -89,6 +89,13 @@ public: */ virtual double get_input_rate(const size_t chan) const = 0; + /*! Manually set the sampling rate at this block's input + * + * \param rate The requested rate + * \param chan The channel for which the rate is being set + */ + virtual void set_input_rate(const double rate, const size_t chan) = 0; + /*! Return the sampling rate at this block's output * * This is equivalent to calling get_input_rate() divided by the decimation. diff --git a/host/include/uhd/rfnoc/duc_block_control.hpp b/host/include/uhd/rfnoc/duc_block_control.hpp index fcf15068e..4cf8a8fb8 100644 --- a/host/include/uhd/rfnoc/duc_block_control.hpp +++ b/host/include/uhd/rfnoc/duc_block_control.hpp @@ -97,6 +97,13 @@ public: */ virtual double get_output_rate(const size_t chan) const = 0; + /*! Manually set the sampling rate at this block's output + * + * \param rate The requested rate + * \param chan The channel for which the rate is being set + */ + virtual void set_output_rate(const double rate, const size_t chan) = 0; + /*! Return a range of valid input rates, based on the current output rate * * Note the return value is only valid as long as the output rate does not |