diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 12:19:18 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 12:19:18 -0700 |
| commit | 5b087a0802a690775536b0101b6881c05b135c42 (patch) | |
| tree | f015c1fde687602aaf0664a57ae14654003a3919 /host/lib/usrp/b200/b200_io_impl.cpp | |
| parent | 0a103ba2bad243652e8c57732190a18a2ee31d38 (diff) | |
| parent | 4e8f0817001d14a9eb2b85f042f185b0c802b6ed (diff) | |
| download | uhd-5b087a0802a690775536b0101b6881c05b135c42.tar.gz uhd-5b087a0802a690775536b0101b6881c05b135c42.tar.bz2 uhd-5b087a0802a690775536b0101b6881c05b135c42.zip | |
Merge branch 'maint' into mwest/b200_rev5
Diffstat (limited to 'host/lib/usrp/b200/b200_io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 4 |
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 cf5ba7a11..3e156f9bb 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -194,7 +194,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 NULL; + return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t()); const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]); switch (sid) { @@ -258,7 +258,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 NULL; + return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t()); } /*********************************************************************** |