diff options
author | Josh Blum <josh@joshknows.com> | 2012-03-06 18:51:31 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-03-23 14:36:56 -0700 |
commit | 672a77767faf0070e94de0c8acd74328a301cae5 (patch) | |
tree | 9d838d8d2b7452660fac6aa8e110d3d4ed3a7b9a /host/lib/usrp/usrp2 | |
parent | 12223186e7ba8a433ef13945a0e4f4077a3a5542 (diff) | |
download | uhd-672a77767faf0070e94de0c8acd74328a301cae5.tar.gz uhd-672a77767faf0070e94de0c8acd74328a301cae5.tar.bz2 uhd-672a77767faf0070e94de0c8acd74328a301cae5.zip |
fifo ctrl: ~usrp2_fifo_ctrl acks, usrp2 DCM workaround, bootloader no blinkie
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp index a602bfe9f..090bae759 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp @@ -18,6 +18,7 @@ #include "usrp2_regs.hpp" #include <uhd/exception.hpp> #include <uhd/utils/msg.hpp> +#include <uhd/utils/safe_call.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include "usrp2_fifo_ctrl.hpp" #include <boost/thread/mutex.hpp> @@ -55,6 +56,13 @@ public: this->init_spi(); } + ~usrp2_fifo_ctrl_impl(void){ + _timeout = ACK_TIMEOUT; //reset timeout to something small + UHD_SAFE_CALL( + this->peek32(0); //dummy peek with the purpose of ack'ing all packets + ) + } + UHD_INLINE void send_pkt(wb_addr_type addr, boost::uint32_t data, int cmd){ managed_send_buffer::sptr buff = _xport->get_send_buff(0.0); if (not buff){ |