diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-26 15:31:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-26 15:31:03 -0700 |
| commit | 693929a9e6e9234610e756e6d25da58d2171a565 (patch) | |
| tree | e796a386d11ec0d081900a99628ac2ee58f473b7 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | f86c25317b457b280c697fc47905c79bdbbc0c93 (diff) | |
| parent | 19c15883a9054727c13f4eb5471cc961fe54c40d (diff) | |
| download | uhd-693929a9e6e9234610e756e6d25da58d2171a565.tar.gz uhd-693929a9e6e9234610e756e6d25da58d2171a565.tar.bz2 uhd-693929a9e6e9234610e756e6d25da58d2171a565.zip | |
Merge branch 'tx_report'
Conflicts:
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index cae1b21d6..2eaf12350 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -235,6 +235,7 @@ public: uhd::rx_metadata_t &, const uhd::io_type_t &, uhd::device::recv_mode_t, size_t ); + bool recv_async_msg(uhd::async_metadata_t &, size_t); private: //device properties interface |