diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-28 17:46:39 -0700 |
| commit | 450abc5b213fc477ae0f2d648405a8b6a55a7b03 (patch) | |
| tree | 01820d898ecd6541f988378413b4c55f16ebad6d /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | 7cb95203f8d7173e3d7070d24f68358be67d0b29 (diff) | |
| parent | b70d4430d4a898fe99b54740a1c4821ed9a1077b (diff) | |
| download | uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.gz uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.tar.bz2 uhd-450abc5b213fc477ae0f2d648405a8b6a55a7b03.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into tvrx_uhd
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 4e883cf81..65411801d 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -150,7 +150,7 @@ void usrp2_impl::io_init(void){ std::memcpy(send_buff->cast<void*>(), &data, sizeof(data)); send_buff->commit(sizeof(data)); //drain the recv buffers (may have junk) - while (data_transport->get_recv_buff().get()); + while (data_transport->get_recv_buff().get()){}; } //the number of recv frames is the number for the first transport @@ -189,7 +189,7 @@ bool usrp2_impl::recv_async_msg( /*********************************************************************** * Send Data **********************************************************************/ -bool get_send_buffs( +static bool get_send_buffs( const std::vector<udp_zero_copy::sptr> &trans, vrt_packet_handler::managed_send_buffs_t &buffs ){ |