aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/rfnoc/rfnoc_tx_streamer.cpp
diff options
context:
space:
mode:
authorCiro Nishiguchi <ciro.nishiguchi@ni.com>2019-08-13 16:50:47 -0500
committerMartin Braun <martin.braun@ettus.com>2019-11-26 11:49:42 -0800
commit77a5358dd03669366a162d67f9ea11b2056c78b6 (patch)
treea80b97c5629c900c69a45fe695597f1b774ce91d /host/lib/rfnoc/rfnoc_tx_streamer.cpp
parentf5e726b0ad83743c173231d9ac019c917a51be07 (diff)
downloaduhd-77a5358dd03669366a162d67f9ea11b2056c78b6.tar.gz
uhd-77a5358dd03669366a162d67f9ea11b2056c78b6.tar.bz2
uhd-77a5358dd03669366a162d67f9ea11b2056c78b6.zip
rfnoc: Add MTU property to RX streamer
Diffstat (limited to 'host/lib/rfnoc/rfnoc_tx_streamer.cpp')
-rw-r--r--host/lib/rfnoc/rfnoc_tx_streamer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/rfnoc/rfnoc_tx_streamer.cpp b/host/lib/rfnoc/rfnoc_tx_streamer.cpp
index 4fc1a3ff8..d4aa267af 100644
--- a/host/lib/rfnoc/rfnoc_tx_streamer.cpp
+++ b/host/lib/rfnoc/rfnoc_tx_streamer.cpp
@@ -60,12 +60,12 @@ rfnoc_tx_streamer::rfnoc_tx_streamer(const size_t num_chans,
[&mtu_out = _mtu_out[i], i, this]() {
RFNOC_LOG_TRACE("Calling resolver for `mtu_out'@" << i);
if (mtu_out.is_valid()) {
- const size_t mtu = mtu_out.get();
- // If the current MTU changes, set the same value for all chans
+ const size_t mtu = std::min(mtu_out.get(), tx_streamer_impl::get_mtu());
+ // Set the same MTU value for all chans
+ for (auto& prop : this->_mtu_out) {
+ prop.set(mtu);
+ }
if (mtu < tx_streamer_impl::get_mtu()) {
- for (auto& prop : this->_mtu_out) {
- prop.set(mtu);
- }
tx_streamer_impl::set_mtu(mtu);
}
}
@@ -155,7 +155,7 @@ void rfnoc_tx_streamer::_register_props(const size_t chan,
_type_out.emplace_back(property_t<std::string>(
PROP_KEY_TYPE, otw_format, {res_source_info::OUTPUT_EDGE, chan}));
_mtu_out.push_back(property_t<size_t>(
- PROP_KEY_MTU, {res_source_info::OUTPUT_EDGE, chan}));
+ PROP_KEY_MTU, get_mtu(), {res_source_info::OUTPUT_EDGE, chan}));
// Give us some shorthands for the rest of this function
property_t<double>* scaling_out = &_scaling_out.back();