From 7ccc535e10c0e22c59e50a4198e916e920042657 Mon Sep 17 00:00:00 2001 From: Michael West Date: Mon, 4 Mar 2019 17:54:35 -0800 Subject: Revert "RFNoC: Fix flush in source_block_ctrl_base" This reverts commit 655b9b0f8e8f8556d434404da51aaccd124bbc3a. Signed-off-by: Michael West --- host/include/uhd/rfnoc/block_ctrl_base.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'host/include') diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp index df3fab02e..0bf701810 100644 --- a/host/include/uhd/rfnoc/block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp @@ -372,9 +372,6 @@ 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( @@ -407,6 +404,9 @@ 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 **********************************************************************/ -- cgit v1.2.3