diff options
Diffstat (limited to 'host/lib/usrp/x300')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_io_impl.cpp | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 0c8d78834..351cb4e10 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1231,8 +1231,8 @@ uhd::both_xports_t x300_impl::make_transport( ? X300_PCIE_RX_DATA_FRAME_SIZE : X300_PCIE_MSG_FRAME_SIZE; - default_buff_args.num_send_frames = - (xport_type == TX_DATA) + default_buff_args.num_send_frames = + (xport_type == TX_DATA) ? X300_PCIE_TX_DATA_NUM_FRAMES : X300_PCIE_MSG_NUM_FRAMES; diff --git a/host/lib/usrp/x300/x300_io_impl.cpp b/host/lib/usrp/x300/x300_io_impl.cpp index 082d83185..af5aa7c9e 100644 --- a/host/lib/usrp/x300/x300_io_impl.cpp +++ b/host/lib/usrp/x300/x300_io_impl.cpp @@ -7,19 +7,9 @@ #include "x300_regs.hpp" #include "x300_impl.hpp" -#include "../../transport/super_recv_packet_handler.hpp" -#include "../../transport/super_send_packet_handler.hpp" -#include <uhdlib/usrp/common/async_packet_handler.hpp> -#include <uhd/transport/nirio_zero_copy.hpp> -#include <uhd/transport/bounded_buffer.hpp> -#include <uhd/utils/tasks.hpp> -#include <uhd/utils/log.hpp> -#include <boost/bind.hpp> -#include <boost/make_shared.hpp> using namespace uhd; using namespace uhd::usrp; -using namespace uhd::transport; /*********************************************************************** * Hooks for get_tx_stream() and get_rx_stream() @@ -62,8 +52,8 @@ void x300_impl::post_streamer_hooks(direction_t dir) // Loop through all tx streamers. Find all radios connected to one // streamer. Sync those. for(const boost::weak_ptr<uhd::tx_streamer> &streamer_w: _tx_streamers.vals()) { - const boost::shared_ptr<sph::send_packet_streamer> streamer = - boost::dynamic_pointer_cast<sph::send_packet_streamer>(streamer_w.lock()); + const boost::shared_ptr<device3_send_packet_streamer> streamer = + boost::dynamic_pointer_cast<device3_send_packet_streamer>(streamer_w.lock()); if (not streamer) { continue; } |