diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-26 17:28:00 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-26 17:28:00 -0700 |
| commit | 248377a1db9f2761fd984528cde11ab66555ebfb (patch) | |
| tree | 1c638c0affb9b3154d288b74428cd5a912edd24a /host/include | |
| parent | f386a2805b1cda04eef8c2ba1a3c680edf28c2a6 (diff) | |
| parent | 9517de45709adaea8b574011573a565007149d5d (diff) | |
| download | uhd-248377a1db9f2761fd984528cde11ab66555ebfb.tar.gz uhd-248377a1db9f2761fd984528cde11ab66555ebfb.tar.bz2 uhd-248377a1db9f2761fd984528cde11ab66555ebfb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/rfnoc/node_ctrl_base.ipp | 2 | ||||
| -rw-r--r-- | host/include/uhd/stream.hpp | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/host/include/uhd/rfnoc/node_ctrl_base.ipp b/host/include/uhd/rfnoc/node_ctrl_base.ipp index 4ab25c597..d300f72a7 100644 --- a/host/include/uhd/rfnoc/node_ctrl_base.ipp +++ b/host/include/uhd/rfnoc/node_ctrl_base.ipp @@ -59,7 +59,7 @@ namespace uhd { ) { size_t our_port = it->first; if (active_only - and not (downstream ? _tx_streamer_active[our_port] : _tx_streamer_active[our_port] )) { + and not (downstream ? _tx_streamer_active[our_port] : _rx_streamer_active[our_port] )) { continue; } sptr one_next_node = it->second.lock(); diff --git a/host/include/uhd/stream.hpp b/host/include/uhd/stream.hpp index 0dfc94c86..7b6cc79b3 100644 --- a/host/include/uhd/stream.hpp +++ b/host/include/uhd/stream.hpp @@ -134,19 +134,6 @@ struct UHD_API stream_args_t{ * - function: magnitude or phase/magnitude * - units: numeric units like counts or dBm * - * In addition, all the transport-related options explained on \ref page_transport can be set here. - * These options can be set either when creating the device (see also \ref config_devaddr), - * or when creating the streamer (when the options are given both times, the stream args - * take precedence): - * - * - recv_frame_size - * - send_frame_size - * - num_recv_frames - * - num_send_frames - * - ups_per_sec - * - ups_per_fifo - * - recv_buff_fullness - * * Other options are device-specific: * - port, addr: Alternative receiver streamer destination. */ |