diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 19:29:36 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 19:29:36 -0800 |
| commit | b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c (patch) | |
| tree | 255b42702a6c11bb91af3180223036667ed461b7 /host/lib/transport | |
| parent | e46edab958579064357d3dc095c0c63e2c5a1273 (diff) | |
| parent | 466bb0a7c25a2a4d252582f812edc83ba6facbfe (diff) | |
| download | uhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.tar.gz uhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.tar.bz2 uhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.zip | |
Merge branch 'convert' into next
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/vrt_packet_handler.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp index 7f8d84308..e4c5539d1 100644 --- a/host/lib/transport/vrt_packet_handler.hpp +++ b/host/lib/transport/vrt_packet_handler.hpp @@ -26,7 +26,7 @@ #include <uhd/types/otw_type.hpp> #include <uhd/types/metadata.hpp> #include <uhd/transport/vrt_if_packet.hpp> -#include <uhd/transport/convert_types.hpp> +#include <uhd/convert.hpp> #include <uhd/transport/zero_copy.hpp> #include <boost/function.hpp> #include <stdexcept> @@ -199,8 +199,9 @@ template <typename T> UHD_INLINE T get_context_code( } //copy-convert the samples from the recv buffer - uhd::transport::convert_otw_type_to_io_type( - state.copy_buffs[i], otw_type, io_buffs, io_type, nsamps_to_copy_per_io_buff + uhd::convert::input_type otw_buffs(1, state.copy_buffs[i]); + uhd::convert::otw_type_to_io_type( + io_type, otw_type, otw_buffs, io_buffs, nsamps_to_copy_per_io_buff ); //update the rx copy buffer to reflect the bytes copied @@ -338,8 +339,9 @@ template <typename T> UHD_INLINE T get_context_code( otw_mem += if_packet_info.num_header_words32; //copy-convert the samples into the send buffer - uhd::transport::convert_io_type_to_otw_type( - io_buffs, io_type, otw_mem, otw_type, num_samps + uhd::convert::output_type otw_buffs(1, otw_mem); + uhd::convert::io_type_to_otw_type( + io_type, otw_type, io_buffs, otw_buffs, num_samps ); //commit the samples to the zero-copy interface |