diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-22 20:01:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-23 09:58:20 -0700 |
| commit | ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d (patch) | |
| tree | 6342382f3d1c45fc5c83ca36fed24a2d4a173aff /host/lib/usrp/b200/b200_io_impl.cpp | |
| parent | fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f (diff) | |
| parent | 9caf20c29956be283b032110096a81f99a121da7 (diff) | |
| download | uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.gz uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.bz2 uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'host/lib/usrp/b200/b200_io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index 85d61280f..283091140 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -161,6 +161,22 @@ void b200_impl::update_tick_rate(const double new_tick_rate) } } +void b200_impl::update_rx_dsp_tick_rate(const double tick_rate, rx_dsp_core_3000::sptr ddc, uhd::fs_path rx_dsp_path) +{ + ddc->set_tick_rate(tick_rate); + if (_tree->access<bool>(rx_dsp_path / "rate" / "set").get()) { + ddc->set_host_rate(_tree->access<double>(rx_dsp_path / "rate" / "value").get()); + } +} + +void b200_impl::update_tx_dsp_tick_rate(const double tick_rate, tx_dsp_core_3000::sptr duc, uhd::fs_path tx_dsp_path) +{ + duc->set_tick_rate(tick_rate); + if (_tree->access<bool>(tx_dsp_path / "rate" / "set").get()) { + duc->set_host_rate(_tree->access<double>(tx_dsp_path / "rate" / "value").get()); + } +} + #define CHECK_RATE_AND_THROW(rate) \ if (uhd::math::fp_compare::fp_compare_delta<double>(rate, uhd::math::FREQ_COMPARISON_DELTA_HZ) > \ uhd::math::fp_compare::fp_compare_delta<double>(ad9361_device_t::AD9361_MAX_CLOCK_RATE, uhd::math::FREQ_COMPARISON_DELTA_HZ)) { \ |