diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-05 11:54:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-03 20:37:10 -0700 |
| commit | fbe2aefe299a4d3ddf8cceb0eb5866136f48744d (patch) | |
| tree | b1bce8c9a61ddb1537a02fabbca0336e3485c58f | |
| parent | 66c95c12a1d2f7b79bdf5b9b871d1b957c56606f (diff) | |
| download | uhd-fbe2aefe299a4d3ddf8cceb0eb5866136f48744d.tar.gz uhd-fbe2aefe299a4d3ddf8cceb0eb5866136f48744d.tar.bz2 uhd-fbe2aefe299a4d3ddf8cceb0eb5866136f48744d.zip | |
usrp2: additional corrections for streaming to work
| -rw-r--r-- | host/lib/transport/super_send_packet_handler.hpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp index edfe9bd13..87ae01d47 100644 --- a/host/lib/transport/super_send_packet_handler.hpp +++ b/host/lib/transport/super_send_packet_handler.hpp @@ -263,6 +263,7 @@ class send_packet_streamer : public send_packet_handler, public tx_streamer{ public: send_packet_streamer(const size_t max_num_samps){ _max_num_samps = max_num_samps; + this->set_max_samples_per_packet(_max_num_samps); } size_t get_num_channels(void) const{ diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 98bfcdd3b..44217c36c 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -298,8 +298,8 @@ void usrp2_impl::update_rx_samp_rate(const std::string &mb, const size_t dsp, co } void usrp2_impl::update_tx_samp_rate(const std::string &mb, const size_t dsp, const double rate){ - boost::shared_ptr<sph::recv_packet_streamer> my_streamer = - boost::dynamic_pointer_cast<sph::recv_packet_streamer>(_mbc[mb].tx_streamers[dsp].lock()); + boost::shared_ptr<sph::send_packet_streamer> my_streamer = + boost::dynamic_pointer_cast<sph::send_packet_streamer>(_mbc[mb].tx_streamers[dsp].lock()); if (my_streamer.get() == NULL) return; boost::mutex::scoped_lock lock = my_streamer->get_scoped_lock(); @@ -450,7 +450,7 @@ tx_streamer::sptr usrp2_impl::get_tx_streamer(const uhd::streamer_args &args){ //init some streamer stuff my_streamer->resize(channels.size()); - my_streamer->set_vrt_packer(&vrt::if_hdr_pack_be); + my_streamer->set_vrt_packer(&vrt::if_hdr_pack_be, vrt_send_header_offset_words32); //set the converter uhd::convert::id_type id; diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 566c93853..a67c704c8 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -86,8 +86,8 @@ private: rx_frontend_core_200::sptr rx_fe; tx_frontend_core_200::sptr tx_fe; std::vector<rx_dsp_core_200::sptr> rx_dsps; - std::vector<boost::weak_ptr<uhd::streamer> > rx_streamers; - std::vector<boost::weak_ptr<uhd::streamer> > tx_streamers; + std::vector<boost::weak_ptr<uhd::rx_streamer> > rx_streamers; + std::vector<boost::weak_ptr<uhd::tx_streamer> > tx_streamers; tx_dsp_core_200::sptr tx_dsp; time64_core_200::sptr time64; std::vector<uhd::transport::zero_copy_if::sptr> rx_dsp_xports; |