diff options
| author | Michael West <michael.west@ettus.com> | 2013-11-20 11:57:38 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-11-20 11:57:38 -0800 |
| commit | 1fe3db82d6d292a186fe26e728dfdf68db4db056 (patch) | |
| tree | 55e4aecf11f2387cde6486dbb671aaa6bdebe470 /host/lib/usrp/b200/b200_impl.hpp | |
| parent | a0bae5347bd542b6f84601f8f0c8c70137ea44d1 (diff) | |
| parent | 58f4af976d64765c2402e1ce00ee78f4aae51881 (diff) | |
| download | uhd-1fe3db82d6d292a186fe26e728dfdf68db4db056.tar.gz uhd-1fe3db82d6d292a186fe26e728dfdf68db4db056.tar.bz2 uhd-1fe3db82d6d292a186fe26e728dfdf68db4db056.zip | |
Merged in branch master
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index eced4a539..362c45347 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -44,10 +44,6 @@ #include <uhd/transport/bounded_buffer.hpp> #include <boost/weak_ptr.hpp> #include "recv_packet_demuxer_3000.hpp" - -static const std::string B200_FW_FILE_NAME = "usrp_b200_fw.hex"; -static const std::string B200_FPGA_FILE_NAME = "usrp_b200_fpga.bin"; -static const std::string B210_FPGA_FILE_NAME = "usrp_b210_fpga.bin"; static const boost::uint8_t B200_FW_COMPAT_NUM_MAJOR = 0x03; static const boost::uint8_t B200_FW_COMPAT_NUM_MINOR = 0x00; static const boost::uint16_t B200_FPGA_COMPAT_NUM = 0x02; @@ -120,7 +116,7 @@ struct b200_impl : public uhd::device boost::weak_ptr<uhd::tx_streamer> _tx_streamer; //async ctrl + msgs - uhd::task::sptr _async_task; + uhd::msg_task::sptr _async_task; typedef uhd::transport::bounded_buffer<uhd::async_metadata_t> async_md_type; struct AsyncTaskData { @@ -130,7 +126,7 @@ struct b200_impl : public uhd::device b200_uart::sptr gpsdo_uart; }; boost::shared_ptr<AsyncTaskData> _async_task_data; - void handle_async_task(uhd::transport::zero_copy_if::sptr, boost::shared_ptr<AsyncTaskData>); + boost::optional<uhd::msg_task::msg_type_t> handle_async_task(uhd::transport::zero_copy_if::sptr, boost::shared_ptr<AsyncTaskData>); void register_loopback_self_test(uhd::wb_iface::sptr iface); void codec_loopback_self_test(uhd::wb_iface::sptr iface); |