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_io_impl.cpp | |
| 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_io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index cb32c610a..60b925517 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -364,6 +364,8 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task( **********************************************************************/ rx_streamer::sptr b200_impl::get_rx_stream(const uhd::stream_args_t &args_) { + boost::mutex::scoped_lock lock(_transport_setup_mutex); + stream_args_t args = args_; //setup defaults for unspecified values @@ -472,6 +474,8 @@ void b200_impl::handle_overflow(const size_t radio_index) **********************************************************************/ tx_streamer::sptr b200_impl::get_tx_stream(const uhd::stream_args_t &args_) { + boost::mutex::scoped_lock lock(_transport_setup_mutex); + stream_args_t args = args_; //setup defaults for unspecified values |