diff options
author | Ben Hilburn <ben.hilburn@ettus.com> | 2013-11-27 15:12:46 -0800 |
---|---|---|
committer | Ben Hilburn <ben.hilburn@ettus.com> | 2013-11-27 15:12:46 -0800 |
commit | abc682eda8d84d5a366ca32ca87e81e0890e69e2 (patch) | |
tree | 214fad451457ac68198ded45524ea51fe557c98a /host/lib/usrp/b200/b200_io_impl.cpp | |
parent | 8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382 (diff) | |
download | uhd-abc682eda8d84d5a366ca32ca87e81e0890e69e2.tar.gz uhd-abc682eda8d84d5a366ca32ca87e81e0890e69e2.tar.bz2 uhd-abc682eda8d84d5a366ca32ca87e81e0890e69e2.zip |
Final merge of Balint's 'kitchen_sink' B200 fixes.
Diffstat (limited to 'host/lib/usrp/b200/b200_io_impl.cpp')
-rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index 4fe90bd4a..4768aa37b 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -249,14 +249,14 @@ rx_streamer::sptr b200_impl::get_rx_stream(const uhd::stream_args_t &args_) //calculate packet size static const size_t hdr_size = 0 + 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().tlr) //no longer using trailer - sizeof(vrt::if_packet_info_t().cid) //no class id ever used - sizeof(vrt::if_packet_info_t().tsi) //no int time ever used ; const size_t bpp = _data_transport->get_recv_frame_size() - hdr_size; const size_t bpi = convert::get_bytes_per_item(args.otw_format); size_t spp = unsigned(args.args.cast<double>("spp", bpp/bpi)); - spp = std::min<size_t>(2000, spp); //magic maximum for framing at full rate + spp = std::min<size_t>(4092, spp); //FPGA FIFO maximum for framing at full rate //make the new streamer given the samples per packet if (not my_streamer) my_streamer = boost::make_shared<sph::recv_packet_streamer>(spp); |