diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-11-21 00:06:20 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-11-21 00:06:20 +0100 |
| commit | 3407376f8af0fc39f29c1c8ce9020d02a2bf05d9 (patch) | |
| tree | b1d70b6296f5a045e2fe0876d46b537a19c1e1ed /host/lib/usrp/b200/b200_impl.hpp | |
| parent | 6714ac0af376ab98f42f49e3f9fa2ceef359c109 (diff) | |
| parent | d43a68499e58f279aec136ce4e609732dbaf2d89 (diff) | |
| download | uhd-3407376f8af0fc39f29c1c8ce9020d02a2bf05d9.tar.gz uhd-3407376f8af0fc39f29c1c8ce9020d02a2bf05d9.tar.bz2 uhd-3407376f8af0fc39f29c1c8ce9020d02a2bf05d9.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.hpp
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index 8e23ea6a0..22e962bd5 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -120,6 +120,11 @@ private: uhd::transport::zero_copy_if::sptr _ctrl_transport; uhd::usrp::recv_packet_demuxer_3000::sptr _demux; + boost::weak_ptr<uhd::rx_streamer> _rx_streamer; + boost::weak_ptr<uhd::tx_streamer> _tx_streamer; + + boost::mutex _transport_setup_mutex; + //async ctrl + msgs uhd::msg_task::sptr _async_task; typedef uhd::transport::bounded_buffer<uhd::async_metadata_t> async_md_type; |