diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-16 20:25:07 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:25:07 -0700 |
| commit | b6bb13bcbab932d54f0502f885a9db8ca906eb5f (patch) | |
| tree | 9fb32906b8356cc39b897385fe9b721955eb3879 | |
| parent | ff0c19d9639f77faf360235ad18cb3b1ed5b7ddf (diff) | |
| parent | eb0833008f38a5b9d33ed9282042bd4ca3fd3ff9 (diff) | |
| download | uhd-b6bb13bcbab932d54f0502f885a9db8ca906eb5f.tar.gz uhd-b6bb13bcbab932d54f0502f885a9db8ca906eb5f.tar.bz2 uhd-b6bb13bcbab932d54f0502f885a9db8ca906eb5f.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/lib/usrp/e100/io_impl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/usrp/e100/io_impl.cpp b/host/lib/usrp/e100/io_impl.cpp index e9608125f..332fe76ae 100644 --- a/host/lib/usrp/e100/io_impl.cpp +++ b/host/lib/usrp/e100/io_impl.cpp @@ -42,6 +42,8 @@ using namespace uhd; using namespace uhd::usrp; using namespace uhd::transport; +static const size_t vrt_send_header_offset_words32 = 1; + /*********************************************************************** * io impl details (internal to this file) * - pirate crew of 1 @@ -324,6 +326,7 @@ tx_streamer::sptr e100_impl::get_tx_stream(const uhd::stream_args_t &args_){ //calculate packet size static const size_t hdr_size = 0 + + vrt_send_header_offset_words32*sizeof(boost::uint32_t) + vrt::max_if_hdr_words32*sizeof(boost::uint32_t) + sizeof(vrt::if_packet_info_t().tlr) //forced to have trailer - sizeof(vrt::if_packet_info_t().sid) //no stream id ever used @@ -338,7 +341,7 @@ tx_streamer::sptr e100_impl::get_tx_stream(const uhd::stream_args_t &args_){ //init some streamer stuff my_streamer->resize(args.channels.size()); - my_streamer->set_vrt_packer(&vrt::if_hdr_pack_le); + my_streamer->set_vrt_packer(&vrt::if_hdr_pack_le, vrt_send_header_offset_words32); //set the converter uhd::convert::id_type id; |