aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorMichael West <michael.west@ettus.com>2019-02-14 10:03:13 -0800
committermichael-west <michael.west@ettus.com>2019-02-18 11:25:15 -0800
commit655b9b0f8e8f8556d434404da51aaccd124bbc3a (patch)
tree5f4df51cafb837102ca76d0f7bd6a5f01be2be9c /host/include
parentf9f7b34d546a79bec55cf9d0e48ef3876f0f67d7 (diff)
downloaduhd-655b9b0f8e8f8556d434404da51aaccd124bbc3a.tar.gz
uhd-655b9b0f8e8f8556d434404da51aaccd124bbc3a.tar.bz2
uhd-655b9b0f8e8f8556d434404da51aaccd124bbc3a.zip
RFNoC: Fix flush in source_block_ctrl_base
The configure_flow_control_out function was set to dump any packets onto the crossbar, which could cause issues on the crossbar and in downstream blocks. Replacing wil a call to the _flush() function in the block_ctrl_base parent class, which drops the packets so they do not get put onto the crossbar. Signed-off-by: Michael West <michael.west@ettus.com>
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/rfnoc/block_ctrl_base.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp
index 0bf701810..df3fab02e 100644
--- a/host/include/uhd/rfnoc/block_ctrl_base.hpp
+++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp
@@ -372,6 +372,9 @@ protected:
// than reset register SR_CLEAR_TX_FC.
virtual void _clear(const size_t port = 0);
+ //! Flush any in-flight packets for this block
+ bool _flush(const size_t port = 0);
+
//! Override this function if your block needs to specially handle
// setting the command time
virtual void _set_command_time(
@@ -404,9 +407,6 @@ private:
//! Helper to start flushing for this block
void _start_drain(const size_t port = 0);
- //! Helper to flush any in-flight packets for this block
- bool _flush(const size_t port = 0);
-
/***********************************************************************
* Private members
**********************************************************************/