aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2016-02-08 11:00:05 -0800
committerMartin Braun <martin.braun@ettus.com>2016-02-08 11:00:05 -0800
commite9bd85c60b5de5f2979d8bf2886d3931aa03f1c8 (patch)
treeb56a5fa74ab5fdf9785e2a63d5b320a9e7b389cd /host/lib
parent502d952a085c7940945f7ec406db3a46df5c8311 (diff)
parent97d338d2f8adabab13992578ece4d4b6b5d6a530 (diff)
downloaduhd-e9bd85c60b5de5f2979d8bf2886d3931aa03f1c8.tar.gz
uhd-e9bd85c60b5de5f2979d8bf2886d3931aa03f1c8.tar.bz2
uhd-e9bd85c60b5de5f2979d8bf2886d3931aa03f1c8.zip
Merge branch 'maint'
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/usrp/b200/b200_io_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp
index 279901208..98347b114 100644
--- a/host/lib/usrp/b200/b200_io_impl.cpp
+++ b/host/lib/usrp/b200/b200_io_impl.cpp
@@ -293,7 +293,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
{
managed_recv_buffer::sptr buff = xport->get_recv_buff();
if (not buff or buff->size() < 8)
- return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t());
+ return boost::none;
const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]);
switch (sid) {
@@ -357,7 +357,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
default:
UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl;
}
- return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t());
+ return boost::none;
}
/***********************************************************************