diff options
| -rw-r--r-- | host/lib/rfnoc/legacy_compat.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/device3/device3_impl.hpp | 11 | ||||
| -rw-r--r-- | host/lib/usrp/device3/device3_io_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 6 |
4 files changed, 14 insertions, 11 deletions
diff --git a/host/lib/rfnoc/legacy_compat.cpp b/host/lib/rfnoc/legacy_compat.cpp index b4f2c522e..3f2bc9584 100644 --- a/host/lib/rfnoc/legacy_compat.cpp +++ b/host/lib/rfnoc/legacy_compat.cpp @@ -408,7 +408,7 @@ public: } // Update streamers: boost::dynamic_pointer_cast<uhd::usrp::device3_impl>(_device) - ->update_rx_streamers(rate); + ->update_rx_streamers(); } void set_tx_rate(const double rate, const size_t chan) @@ -460,7 +460,7 @@ public: } // Update streamers: boost::dynamic_pointer_cast<uhd::usrp::device3_impl>(_device) - ->update_tx_streamers(rate); + ->update_tx_streamers(); } private: // types diff --git a/host/lib/usrp/device3/device3_impl.hpp b/host/lib/usrp/device3/device3_impl.hpp index 62fd399ac..17f6a3f6f 100644 --- a/host/lib/usrp/device3/device3_impl.hpp +++ b/host/lib/usrp/device3/device3_impl.hpp @@ -170,10 +170,15 @@ protected: /*********************************************************************** * Streaming-related **********************************************************************/ - // The 'rate' argument is so we can use these as subscribers to rate changes public: // TODO make these protected again - void update_rx_streamers(double rate = -1.0); - void update_tx_streamers(double rate = -1.0); + /*! Update tick rate, samp rate, and scaling on the streamers by querying + * the graph. + */ + void update_rx_streamers(); + /*! Update tick rate, samp rate, and scaling on the streamers by querying + * the graph. + */ + void update_tx_streamers(); protected: /*********************************************************************** diff --git a/host/lib/usrp/device3/device3_io_impl.cpp b/host/lib/usrp/device3/device3_io_impl.cpp index 188deb89c..06415dd91 100644 --- a/host/lib/usrp/device3/device3_io_impl.cpp +++ b/host/lib/usrp/device3/device3_io_impl.cpp @@ -256,7 +256,7 @@ bool device3_impl::recv_async_msg(async_metadata_t& async_metadata, double timeo /*********************************************************************** * Receive streamer **********************************************************************/ -void device3_impl::update_rx_streamers(double /* rate */) +void device3_impl::update_rx_streamers() { for (const std::string& block_id : _rx_streamers.keys()) { UHD_RX_STREAMER_LOG() << "updating RX streamer to " << block_id; @@ -523,7 +523,7 @@ rx_streamer::sptr device3_impl::get_rx_stream(const stream_args_t& args_) /*********************************************************************** * Transmit streamer **********************************************************************/ -void device3_impl::update_tx_streamers(double /* rate */) +void device3_impl::update_tx_streamers() { for (const std::string& block_id : _tx_streamers.keys()) { UHD_TX_STREAMER_LOG() << "updating TX streamer: " << block_id; diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index ac5b66442..76759acb3 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1162,10 +1162,8 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t& dev_addr) } return master_clock_rate; }) - .add_coerced_subscriber( - [this](const double rate) { this->update_tx_streamers(rate); }) - .add_coerced_subscriber( - [this](const double rate) { this->update_rx_streamers(rate); }) + .add_coerced_subscriber([this](const double) { this->update_tx_streamers(); }) + .add_coerced_subscriber([this](const double) { this->update_rx_streamers(); }) .set(master_clock_rate); //////////////////////////////////////////////////////////////////// |