diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-04 10:09:31 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-04 10:09:31 -0700 |
| commit | 1da774f8abffefb9ed239699551fb116a5effba3 (patch) | |
| tree | 77385c5a521e5a2e99dbf969d7770ff4b6bf229f /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 46d2fc423d2fdcf32454621c6f41e555d2496702 (diff) | |
| parent | 9cea1342941e74b911ca26cc41c64e340f04c270 (diff) | |
| download | uhd-1da774f8abffefb9ed239699551fb116a5effba3.tar.gz uhd-1da774f8abffefb9ed239699551fb116a5effba3.tar.bz2 uhd-1da774f8abffefb9ed239699551fb116a5effba3.zip | |
Merge branch 'timeout' into usrp_e_mmap
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 157d17057..e8763b284 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -234,7 +234,7 @@ public: size_t send( const std::vector<const void *> &, size_t, const uhd::tx_metadata_t &, const uhd::io_type_t &, - uhd::device::send_mode_t + uhd::device::send_mode_t, double ); size_t get_max_recv_samps_per_packet(void) const{ return _io_helper.get_max_recv_samps_per_packet(); @@ -242,9 +242,9 @@ public: size_t recv( const std::vector<void *> &, size_t, uhd::rx_metadata_t &, const uhd::io_type_t &, - uhd::device::recv_mode_t, size_t + uhd::device::recv_mode_t, double ); - bool recv_async_msg(uhd::async_metadata_t &, size_t); + bool recv_async_msg(uhd::async_metadata_t &, double); private: //device properties interface |