diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-20 16:58:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-20 16:58:33 -0700 |
| commit | 8e29df8b3176d966ba2b987f0bbaea108ba8135c (patch) | |
| tree | 6d142c308ea0c197a464a93a6a7fbd3d0d1f5ab2 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 20381a1c839ded4eb58728d3a1fd3a952d2444f6 (diff) | |
| parent | 5a4545d3f9689dcddd88f9316ad7bd9c489a3925 (diff) | |
| download | uhd-8e29df8b3176d966ba2b987f0bbaea108ba8135c.tar.gz uhd-8e29df8b3176d966ba2b987f0bbaea108ba8135c.tar.bz2 uhd-8e29df8b3176d966ba2b987f0bbaea108ba8135c.zip | |
Merge branch 'master' into tx_report
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index ab23830c0..cae1b21d6 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -224,8 +224,7 @@ public: } size_t send( const std::vector<const void *> &, size_t, - const uhd::tx_metadata_t &, - const uhd::io_type_t &, + const uhd::tx_metadata_t &, const uhd::io_type_t &, uhd::device::send_mode_t ); size_t get_max_recv_samps_per_packet(void) const{ @@ -233,9 +232,8 @@ public: } size_t recv( const std::vector<void *> &, size_t, - uhd::rx_metadata_t &, - const uhd::io_type_t &, - uhd::device::recv_mode_t + uhd::rx_metadata_t &, const uhd::io_type_t &, + uhd::device::recv_mode_t, size_t ); private: |