aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul David <paul.david@ettus.com>2016-04-11 09:38:49 -0700
committerAshish Chaudhari <ashish@ettus.com>2016-04-18 12:23:45 -0700
commitac1bb2963ed9f0de342c300986121db1c855fc1d (patch)
tree27073b965143c267d922d322fd516c661865ea93
parentb28fcee59998512f15c1f693f5a5958b6a464a56 (diff)
downloaduhd-ac1bb2963ed9f0de342c300986121db1c855fc1d.tar.gz
uhd-ac1bb2963ed9f0de342c300986121db1c855fc1d.tar.bz2
uhd-ac1bb2963ed9f0de342c300986121db1c855fc1d.zip
vita core: Fix the hard reset issue by flushing the flow control window
-rw-r--r--host/lib/usrp/cores/rx_vita_core_3000.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/host/lib/usrp/cores/rx_vita_core_3000.cpp b/host/lib/usrp/cores/rx_vita_core_3000.cpp
index f61da7cc3..52121837e 100644
--- a/host/lib/usrp/cores/rx_vita_core_3000.cpp
+++ b/host/lib/usrp/cores/rx_vita_core_3000.cpp
@@ -20,6 +20,8 @@
#include <uhd/utils/safe_call.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/tuple/tuple.hpp>
+#include <boost/date_time.hpp>
+#include <boost/thread.hpp>
#define REG_FRAMER_MAXLEN _base + 4*4 + 0
#define REG_FRAMER_SID _base + 4*4 + 4
@@ -63,6 +65,17 @@ struct rx_vita_core_3000_impl : rx_vita_core_3000
void configure_flow_control(const size_t window_size)
{
+ // The window needs to be disabled in the case where this object is
+ // uncleanly destroyed and the FC window is left enabled
+ _iface->poke32(REG_FC_ENABLE, 0);
+
+ // Sleep for a large amount of time to allow the source flow control
+ // module in the FPGA to flush all the packets buffered upstream.
+ // At 1 ms * 200 MHz = 200k cycles, 8 bytes * 200k cycles = 1.6 MB
+ // of flushed data, when the typical amount of data buffered
+ // is on the order of kilobytes
+ boost::this_thread::sleep(boost::posix_time::milliseconds(1.0));
+
_iface->poke32(REG_FC_WINDOW, window_size-1);
_iface->poke32(REG_FC_ENABLE, window_size?1:0);
}