diff options
| -rw-r--r-- | host/docs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/docs/usrp2.rst | 5 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index c649dbb61..bbe0fec26 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -28,6 +28,7 @@ SET(manual_sources images.rst transport.rst usrp1.rst + usrp2.rst usrp_nxxx.rst ) diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst new file mode 100644 index 000000000..af2df66c6 --- /dev/null +++ b/host/docs/usrp2.rst @@ -0,0 +1,5 @@ +======================================================================== +UHD - USRP2 Application Notes +======================================================================== + +* `USRP2 and USRP-N Series Application Notes <./usrp_nxxx.html>`_ 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; diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 13d8b9856..6f1184ad7 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -77,12 +77,6 @@ usrp2_mboard_impl::usrp2_mboard_impl( _allowed_decim_and_interp_rates.push_back(i); } - - //Issue a stop streaming command (in case it was left running). - //Since this command is issued before the networking is setup, - //most if not all junk packets will never make it to the socket. - this->issue_ddc_stream_cmd(stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); - //setup the vrt rx registers _iface->poke32(_iface->regs.rx_ctrl_clear_overrun, 1); //reset _iface->poke32(_iface->regs.rx_ctrl_nsamps_per_pkt, recv_samps_per_packet); |