diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-09-30 12:28:29 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-30 12:28:29 -0700 |
| commit | 6dd502737bcf6e59933be01720672db9a496803b (patch) | |
| tree | 5ab70f1c7cb4f2fdd8b5924b5d7abacbd772c9be /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | ed245848df8cc011ae8fe30833ecc28049139db5 (diff) | |
| parent | e4fffed05dda57bb37d693a3a26ea6a903c925f7 (diff) | |
| download | uhd-6dd502737bcf6e59933be01720672db9a496803b.tar.gz uhd-6dd502737bcf6e59933be01720672db9a496803b.tar.bz2 uhd-6dd502737bcf6e59933be01720672db9a496803b.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 94ff5c2ce..b0603f951 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -150,7 +150,8 @@ 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 +190,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 ){ |