From 8a78802c10fa64af5d1ec7cf39ce389f003cce11 Mon Sep 17 00:00:00 2001 From: Johannes Demel Date: Tue, 19 Nov 2013 13:17:52 -0800 Subject: b200/dtor-stall: final fixes for stall bug --- host/lib/usrp/b200/b200_io_impl.cpp | 9 +++++---- host/lib/usrp/cores/radio_ctrl_core_3000.cpp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index 069b8ff58..1eddeb8bc 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -155,11 +155,12 @@ boost::optional b200_impl::handle_async_task( boost::shared_ptr data ) { - managed_recv_buffer::sptr buff = xport->get_recv_buff(); - if (not buff or buff->size() < 8) return NULL; + managed_recv_buffer::sptr buff = xport->get_recv_buff(); + if (not buff or buff->size() < 8) + return NULL; + const boost::uint32_t sid = uhd::wtohx(buff->cast()[1]); - switch (sid) - { + switch (sid) { //if the packet is a control response case B200_RESP0_MSG_SID: diff --git a/host/lib/usrp/cores/radio_ctrl_core_3000.cpp b/host/lib/usrp/cores/radio_ctrl_core_3000.cpp index 13b346cc6..0d6e1c665 100644 --- a/host/lib/usrp/cores/radio_ctrl_core_3000.cpp +++ b/host/lib/usrp/cores/radio_ctrl_core_3000.cpp @@ -66,8 +66,8 @@ public: UHD_LOG << "~radio_ctrl_core_3000_impl() " << _name << std::endl; _timeout = ACK_TIMEOUT; //reset timeout to something small UHD_SAFE_CALL( - this->peek32(0);//dummy peek with the purpose of ack'ing all packets - _async_task.reset();//now its ok to release the task + this->peek32(0);//dummy peek with the purpose of ack'ing all packets + _async_task.reset();//now its ok to release the task ) } -- cgit v1.2.3