aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2019-01-28 17:38:34 -0800
committerAshish Chaudhari <ashish.chaudhari@ettus.com>2019-01-31 13:48:02 -0800
commit8d639b4b68b8328fb1e761fc5b75eb7c7f5a65d7 (patch)
tree05ea39fa35d17a94c94d6d7f676d7e005f3cddd8 /host/lib/usrp
parentf712d477b97e2ee7cca56d5afcf199f00959eb85 (diff)
downloaduhd-8d639b4b68b8328fb1e761fc5b75eb7c7f5a65d7.tar.gz
uhd-8d639b4b68b8328fb1e761fc5b75eb7c7f5a65d7.tar.bz2
uhd-8d639b4b68b8328fb1e761fc5b75eb7c7f5a65d7.zip
X300: Fix tick and sample rate setting
- Removed incorrect function call to set tick rate in x300_radio_ctrl_impl. - Modified legacy compat layer to properly set tick and sample rates. These changes eliminate the tick and sample rate warnings during X300 initialization if TwinRX is used and allow for TwinRX to be used alongside other types of daughterboards in the same X300. Signed-off-by: michael-west <michael.west@ettus.com>
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/x300/x300_radio_ctrl_impl.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
index 9057180e4..76971a76e 100644
--- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
@@ -903,11 +903,7 @@ void x300_radio_ctrl_impl::setup_radio(uhd::i2c_iface::sptr zpu_i2c,
////////////////////////////////////////////////////////////////
// Set tick rate
////////////////////////////////////////////////////////////////
- const double tick_rate = get_output_samp_rate(0);
- if (_radio_type == PRIMARY) {
- // Slot A is the highlander timekeeper
- _tree->access<double>("tick_rate").set(tick_rate);
- }
+ const double tick_rate = _tree->access<double>("tick_rate").get();
radio_ctrl_impl::set_rate(tick_rate);
}