aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/io_impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp/usrp1/io_impl.cpp')
-rw-r--r--host/lib/usrp/usrp1/io_impl.cpp27
1 files changed, 22 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 12950d385..31c834109 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -442,7 +442,6 @@ void usrp1_impl::update_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec){
this->restore_tx(s);
}
-
void usrp1_impl::update_tick_rate(const double rate){
//updating this variable should:
//update dboard iface -> it has a reference
@@ -450,11 +449,29 @@ void usrp1_impl::update_tick_rate(const double rate){
_master_clock_rate = rate;
}
+uhd::meta_range_t usrp1_impl::get_rx_dsp_host_rates(void){
+ meta_range_t range;
+ const size_t div = this->has_rx_halfband()? 2 : 1;
+ for (int rate = 256; rate >= 4; rate -= div){
+ range.push_back(range_t(_master_clock_rate/rate));
+ }
+ return range;
+}
+
+uhd::meta_range_t usrp1_impl::get_tx_dsp_host_rates(void){
+ meta_range_t range;
+ const size_t div = this->has_tx_halfband()? 2 : 1;
+ for (int rate = 256; rate >= 8; rate -= div){
+ range.push_back(range_t(_master_clock_rate/rate));
+ }
+ return range;
+}
+
double usrp1_impl::update_rx_samp_rate(size_t dspno, const double samp_rate){
const size_t div = this->has_rx_halfband()? 2 : 1;
- const size_t rate = uhd::clip<size_t>(
- boost::math::iround(_master_clock_rate / samp_rate), 4, 256) & ~(div-1);
+ const size_t rate = this->get_rx_dsp_host_rates().clip(
+ boost::math::iround(_master_clock_rate / samp_rate), true);
if (rate < 8 and this->has_rx_halfband()) UHD_MSG(warning) <<
"USRP1 cannot achieve decimations below 8 when the half-band filter is present.\n"
@@ -482,8 +499,8 @@ double usrp1_impl::update_rx_samp_rate(size_t dspno, const double samp_rate){
double usrp1_impl::update_tx_samp_rate(size_t dspno, const double samp_rate){
const size_t div = this->has_tx_halfband()? 2 : 1;
- const size_t rate = uhd::clip<size_t>(
- boost::math::iround(_master_clock_rate / samp_rate), 8, 256) & ~(div-1);
+ const size_t rate = this->get_tx_dsp_host_rates().clip(
+ boost::math::iround(_master_clock_rate / samp_rate), true);
if (dspno == 0){ //only care if dsp0 is set since its homogeneous
bool s = this->disable_tx();