summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-09 20:04:31 -0800
committerJosh Blum <josh@joshknows.com>2011-02-09 20:04:31 -0800
commitf73f2410ee33648538d5fde92bd018b3e96ed548 (patch)
tree1b816c2e72529db4b1a5195b9ffd326089c1b90f /host/lib/usrp/usrp2
parentaa73e29d507f1523c17cf625dbd9c68f5a7d3787 (diff)
parentfa35192bcb89c6f026d76d7f5190e22341840a47 (diff)
downloaduhd-f73f2410ee33648538d5fde92bd018b3e96ed548.tar.gz
uhd-f73f2410ee33648538d5fde92bd018b3e96ed548.tar.bz2
uhd-f73f2410ee33648538d5fde92bd018b3e96ed548.zip
Merge branch 'master' into next
Conflicts: host/lib/transport/udp_zero_copy_asio.cpp
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r--host/lib/usrp/usrp2/mboard_impl.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 784f662d9..397fae636 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -157,6 +157,14 @@ usrp2_mboard_impl::usrp2_mboard_impl(
//set default subdev specs
(*this)[MBOARD_PROP_RX_SUBDEV_SPEC] = subdev_spec_t();
(*this)[MBOARD_PROP_TX_SUBDEV_SPEC] = subdev_spec_t();
+
+ //This is a hack/fix for the lingering packet problem.
+ stream_cmd_t stream_cmd(stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE);
+ stream_cmd.num_samps = 1;
+ this->issue_ddc_stream_cmd(stream_cmd);
+ data_transport->get_recv_buff().get(); //recv with timeout for lingering
+ data_transport->get_recv_buff().get(); //recv with timeout for expected
+ _iface->poke32(_iface->regs.rx_ctrl_clear_overrun, 1); //resets sequence
}
usrp2_mboard_impl::~usrp2_mboard_impl(void){