aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul David <paul.david@ettus.com>2016-06-06 13:45:31 -0700
committerMartin Braun <martin.braun@ettus.com>2016-10-05 14:36:17 -0700
commit90a2ce4432222e252a08485f98ad6fea7ed662c5 (patch)
treee01719ca350a008e9f799714073452d74932622c
parented3be5607de7ea20f3ed1a5bfef4a060ade006be (diff)
downloaduhd-90a2ce4432222e252a08485f98ad6fea7ed662c5.tar.gz
uhd-90a2ce4432222e252a08485f98ad6fea7ed662c5.tar.bz2
uhd-90a2ce4432222e252a08485f98ad6fea7ed662c5.zip
UHD: Fixed the max link warning for the case where there are multiple motherboards
-rw-r--r--host/lib/usrp/multi_usrp.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 7905a6d32..52dfa5773 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -1877,6 +1877,7 @@ private:
//! \param is_tx True for tx
// Assumption is that all mboards use the same link
+ // and that the rate sum is evenly distributed among the mboards
bool _check_link_rate(const stream_args_t &args, bool is_tx) {
bool link_rate_is_ok = true;
size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format.empty() ? "sc16" : args.otw_format);
@@ -1892,6 +1893,7 @@ private:
}
sum_rate += is_tx ? get_tx_rate(chan) : get_rx_rate(chan);
}
+ sum_rate /= get_num_mboards();
if (max_link_rate > 0 and (max_link_rate / bytes_per_sample) < sum_rate) {
UHD_MSG(warning) << boost::format(
"The total sum of rates (%f MSps on %u channels) exceeds the maximum capacity of the connection.\n"