diff options
| author | Michael West <michael.west@ettus.com> | 2019-03-04 17:54:35 -0800 | 
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2019-03-05 10:34:21 -0800 | 
| commit | 7ccc535e10c0e22c59e50a4198e916e920042657 (patch) | |
| tree | 3912aecbf23ae82cbcc6113e4b727651f870da06 /host/include | |
| parent | 5b29b95de8219e8da26fd6c3e2b4a735caaf4374 (diff) | |
| download | uhd-7ccc535e10c0e22c59e50a4198e916e920042657.tar.gz uhd-7ccc535e10c0e22c59e50a4198e916e920042657.tar.bz2 uhd-7ccc535e10c0e22c59e50a4198e916e920042657.zip  | |
Revert "RFNoC: Fix flush in source_block_ctrl_base"
This reverts commit 655b9b0f8e8f8556d434404da51aaccd124bbc3a.
Signed-off-by: Michael West <michael.west@ettus.com>
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/rfnoc/block_ctrl_base.hpp | 6 | 
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 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       **********************************************************************/  | 
