diff options
| author | Balint Seeber <balint@ettus.com> | 2013-11-19 13:30:21 -0800 |
|---|---|---|
| committer | Balint Seeber <balint@ettus.com> | 2013-11-19 13:30:21 -0800 |
| commit | 48ab2a971e73e46a7165ca5ebfff9a946fd5e981 (patch) | |
| tree | d3b07bd21a7327d35022ab5efe35d8298975cbe4 /host/lib/usrp/b200/b200_impl.hpp | |
| parent | 01cfe2118f0bd72719809d2539c61df46a164fec (diff) | |
| parent | 8a78802c10fa64af5d1ec7cf39ce389f003cce11 (diff) | |
| download | uhd-48ab2a971e73e46a7165ca5ebfff9a946fd5e981.tar.gz uhd-48ab2a971e73e46a7165ca5ebfff9a946fd5e981.tar.bz2 uhd-48ab2a971e73e46a7165ca5ebfff9a946fd5e981.zip | |
Merge remote-tracking branch 'origin/b200/dtor-master' into b200/kitchen_sink
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index eced4a539..59a047e01 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -120,7 +120,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 +130,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); |