diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-29 12:25:19 -0500 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-29 12:25:19 -0500 |
commit | 3e268baedbb93fd51888d991e53abf6f658c4c97 (patch) | |
tree | 9a1437e5a5e35e66505380dfbaff3cd31369f3af /host/lib/usrp/usrp2/io_impl.cpp | |
parent | afd885501331932924ed7859aea0c8919a043b1c (diff) | |
download | uhd-3e268baedbb93fd51888d991e53abf6f658c4c97.tar.gz uhd-3e268baedbb93fd51888d991e53abf6f658c4c97.tar.bz2 uhd-3e268baedbb93fd51888d991e53abf6f658c4c97.zip |
usrp-n: some rx path fixes
removed stop streaming command from init (taken care of by reset)
fixed incoming packet filter to pass inline message packets
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index f903a80f6..cbc0a0817 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -195,7 +195,7 @@ void usrp2_impl::io_impl::recv_pirate_loop( vrt::if_hdr_unpack_be(vrt_hdr, if_packet_info); //handle the rx data stream - if (if_packet_info.sid == usrp2_impl::RECV_SID and if_packet_info.packet_type == vrt::if_packet_info_t::PACKET_TYPE_DATA){ + if (if_packet_info.sid == usrp2_impl::RECV_SID){ //handle the packet count / sequence number if (if_packet_info.packet_count != next_packet_seq){ //std::cerr << "S" << (if_packet_info.packet_count - next_packet_seq)%16; @@ -211,10 +211,11 @@ void usrp2_impl::io_impl::recv_pirate_loop( //push the packet into the buffer with the new time recv_pirate_booty->push_with_pop_on_full(buff, time, index); + continue; } //handle a tx async report message - else if (if_packet_info.sid == usrp2_impl::ASYNC_SID and if_packet_info.packet_type != vrt::if_packet_info_t::PACKET_TYPE_DATA){ + if (if_packet_info.sid == usrp2_impl::ASYNC_SID and if_packet_info.packet_type != vrt::if_packet_info_t::PACKET_TYPE_DATA){ //fill in the async metadata async_metadata_t metadata; |