saymrwulf/uhd
1
0
Fork 0
mirror of https://github.com/saymrwulf/uhd.git synced 2026-05-16 21:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into flow_ctrl

Browse source 
Conflicts:
	host/lib/usrp/usrp2/io_impl.cpp
This commit is contained in:
Josh Blum 2010-10-18 17:04:08 -07:00
commit 5bf9e60baf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
host/lib/usrp/usrp2/io_impl.cpp
View file

@ -112,7 +112,7 @@ struct usrp2_impl::io_impl{
io_impl(size_t num_recv_frames, size_t send_frame_size, size_t width):
packet_handler_recv_state(width),
recv_pirate_booty(alignment_buffer_type::make(num_recv_frames, width)),
recv_pirate_booty(alignment_buffer_type::make(num_recv_frames-3, width)),
async_msg_fifo(bounded_buffer<async_metadata_t>::make(100/*messages deep*/))
{
for (size_t i = 0; i < width; i++) fc_mons.push_back(