aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2020-08-06 14:04:27 -0700
committerAaron Rossetto <aaron.rossetto@ni.com>2020-08-07 07:43:58 -0500
commit3a2a3610c243450cff31151b402039d0403699ab (patch)
tree0790ae1285084503e1452056945bc4735d1792e7
parent29394e29946e93de3c1c2781fee234f6da945afa (diff)
downloaduhd-3a2a3610c243450cff31151b402039d0403699ab.tar.gz
uhd-3a2a3610c243450cff31151b402039d0403699ab.tar.bz2
uhd-3a2a3610c243450cff31151b402039d0403699ab.zip
RFNoC: Revert change in streamer initialization
Reverting inadvertent change in num_chans argument during tx/rx_streamer_impl construction. Signed-off-by: michael-west <michael.west@ettus.com>
-rw-r--r--host/lib/rfnoc/rfnoc_rx_streamer.cpp2
-rw-r--r--host/lib/rfnoc/rfnoc_tx_streamer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/rfnoc/rfnoc_rx_streamer.cpp b/host/lib/rfnoc/rfnoc_rx_streamer.cpp
index 180f5e87f..f7459dbfc 100644
--- a/host/lib/rfnoc/rfnoc_rx_streamer.cpp
+++ b/host/lib/rfnoc/rfnoc_rx_streamer.cpp
@@ -21,7 +21,7 @@ static std::atomic<uint64_t> streamer_inst_ctr;
rfnoc_rx_streamer::rfnoc_rx_streamer(const size_t num_chans,
const uhd::stream_args_t stream_args,
disconnect_fn_t disconnect_cb)
- : rx_streamer_impl<chdr_rx_data_xport>(stream_args.channels.size(), stream_args)
+ : rx_streamer_impl<chdr_rx_data_xport>(num_chans, stream_args)
, _unique_id(STREAMER_ID + "#" + std::to_string(streamer_inst_ctr++))
, _stream_args(stream_args)
, _disconnect_cb(disconnect_cb)
diff --git a/host/lib/rfnoc/rfnoc_tx_streamer.cpp b/host/lib/rfnoc/rfnoc_tx_streamer.cpp
index 578db5cdf..a00b41c75 100644
--- a/host/lib/rfnoc/rfnoc_tx_streamer.cpp
+++ b/host/lib/rfnoc/rfnoc_tx_streamer.cpp
@@ -19,7 +19,7 @@ static constexpr size_t ASYNC_MSG_QUEUE_SIZE = 1000;
rfnoc_tx_streamer::rfnoc_tx_streamer(const size_t num_chans,
const uhd::stream_args_t stream_args,
disconnect_fn_t disconnect_cb)
- : tx_streamer_impl<chdr_tx_data_xport>(stream_args.channels.size(), stream_args)
+ : tx_streamer_impl<chdr_tx_data_xport>(num_chans, stream_args)
, _unique_id(STREAMER_ID + "#" + std::to_string(streamer_inst_ctr++))
, _stream_args(stream_args)
, _disconnect_cb(disconnect_cb)