diff options
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/common/adf535x.cpp | 10 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/host/lib/usrp/common/adf535x.cpp b/host/lib/usrp/common/adf535x.cpp index 67a94bcc1..ab81fbee7 100644 --- a/host/lib/usrp/common/adf535x.cpp +++ b/host/lib/usrp/common/adf535x.cpp @@ -6,12 +6,12 @@ #include <uhdlib/usrp/common/adf535x.hpp> -adf535x_iface::sptr adf535x_iface::make_adf5355(write_fn_t write) +adf535x_iface::sptr adf535x_iface::make_adf5355(write_fn_t write, wait_fn_t wait) { - return std::make_shared<adf535x_impl<adf5355_regs_t>>(write); + return std::make_shared<adf535x_impl<adf5355_regs_t>>(write, wait); } -adf535x_iface::sptr adf535x_iface::make_adf5356(write_fn_t write) +adf535x_iface::sptr adf535x_iface::make_adf5356(write_fn_t write, wait_fn_t wait) { - return std::make_shared<adf535x_impl<adf5356_regs_t>>(write); -}
\ No newline at end of file + return std::make_shared<adf535x_impl<adf5356_regs_t>>(write, wait); +} diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp index 1b45805e7..55b74753c 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.cpp @@ -25,7 +25,7 @@ namespace { const double TWINRX_DESIRED_REFERENCE_FREQ = 50e6; const double TWINRX_REV_AB_PFD_FREQ = 6.25e6; const double TWINRX_REV_C_PFD_FREQ = 12.5e6; - const double TWINRX_SPI_CLOCK_FREQ = 3e6; + const double TWINRX_SPI_CLOCK_FREQ = 10e6; } class twinrx_ctrl_impl : public twinrx_ctrl { @@ -99,14 +99,19 @@ public: _lo1_iface[i] = adf535x_iface::make_adf5356( [this](const std::vector<uint32_t>& regs) { _write_lo_spi(dboard_iface::UNIT_TX, regs); + }, + [this](uint32_t microseconds) { + _db_iface->sleep(boost::chrono::microseconds(microseconds)); } ); _lo1_iface[i]->set_pfd_freq(TWINRX_REV_C_PFD_FREQ); - } else { _lo1_iface[i] = adf535x_iface::make_adf5355( [this](const std::vector<uint32_t>& regs) { _write_lo_spi(dboard_iface::UNIT_TX, regs); + }, + [this](uint32_t microseconds) { + _db_iface->sleep(boost::chrono::microseconds(microseconds)); } ); _lo1_iface[i]->set_pfd_freq(TWINRX_REV_AB_PFD_FREQ); |