From 1cdfe30725c90c950fda1e5cd3810a1e143fbaa3 Mon Sep 17 00:00:00 2001 From: Michael West Date: Thu, 19 Mar 2020 12:49:29 -0700 Subject: multi_usrp_rfnoc: Misc fixes - Change get_master_clock_rate() to return tick rate instead of sample rate - Make warning of incompatible rates conditional so it does not display for first channel Signed-off-by: Michael West --- host/lib/usrp/multi_usrp_rfnoc.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'host/lib') diff --git a/host/lib/usrp/multi_usrp_rfnoc.cpp b/host/lib/usrp/multi_usrp_rfnoc.cpp index a62fe3f8e..aa28c6784 100644 --- a/host/lib/usrp/multi_usrp_rfnoc.cpp +++ b/host/lib/usrp/multi_usrp_rfnoc.cpp @@ -303,10 +303,11 @@ public: const double chan_rate = _rx_rates.count(rx_channel) ? _rx_rates.at(rx_channel) : 1.0; if (chan_rate > 1.0 && rate != chan_rate) { - UHD_LOG_DEBUG("MULTI_USRP", - "Inconsistent RX rates when creating streamer! Harmonizing " - "to " - << chan_rate); + if (rate > 1.0) { + UHD_LOG_DEBUG("MULTI_USRP", + "Inconsistent RX rates when creating streamer! " + "Harmonizing to " << chan_rate); + } rate = chan_rate; } } @@ -609,13 +610,13 @@ public: for (auto& chain : _rx_chans) { auto radio = chain.second.radio; if (radio->get_block_id().get_device_no() == mboard) { - return radio->get_rate(); + return radio->get_tick_rate(); } } for (auto& chain : _tx_chans) { auto radio = chain.second.radio; if (radio->get_block_id().get_device_no() == mboard) { - return radio->get_rate(); + return radio->get_tick_rate(); } } throw uhd::key_error("Invalid mboard index!"); -- cgit v1.2.3