diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-07 10:11:32 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-07 10:11:32 -0700 |
| commit | 86b021e48031f2bc6e99c7c5d2d626ea149dec70 (patch) | |
| tree | c107d3d7fb0f34da17085c06e81aa96258c38746 /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | d5a0960455560e9f6077aa45d52aa01c469769dd (diff) | |
| parent | b40ace72dd1b940fc0ce6e4a5e06346439dd5625 (diff) | |
| download | uhd-86b021e48031f2bc6e99c7c5d2d626ea149dec70.tar.gz uhd-86b021e48031f2bc6e99c7c5d2d626ea149dec70.tar.bz2 uhd-86b021e48031f2bc6e99c7c5d2d626ea149dec70.zip | |
Merge branch 'next' into usrp_e_mmap_b2
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 33cec3cbc..07eda08c3 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -206,7 +206,7 @@ size_t usrp2_impl::send( _io_impl->packet_handler_send_state, //last state of the send handler buffs, num_samps, //buffer to fill metadata, send_mode, //samples metadata - io_type, _io_helper.get_tx_otw_type(), //input and output types to convert + io_type, _tx_otw_type, //input and output types to convert _mboards.front()->get_master_clock_freq(), //master clock tick rate uhd::transport::vrt::if_hdr_pack_be, boost::bind(&get_send_buffs, _data_transports, _1, timeout), @@ -226,7 +226,7 @@ size_t usrp2_impl::recv( _io_impl->packet_handler_recv_state, //last state of the recv handler buffs, num_samps, //buffer to fill metadata, recv_mode, //samples metadata - io_type, _io_helper.get_rx_otw_type(), //input and output types to convert + io_type, _rx_otw_type, //input and output types to convert _mboards.front()->get_master_clock_freq(), //master clock tick rate uhd::transport::vrt::if_hdr_unpack_be, boost::bind(&usrp2_impl::io_impl::get_recv_buffs, _io_impl.get(), _1, timeout) |