diff options
| author | Michael West <michael.west@ettus.com> | 2018-04-10 12:24:36 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-07-17 09:35:31 -0700 |
| commit | 08855405d6511774f65d2b7c7a976202e215bb7d (patch) | |
| tree | 3c9f190bbb5f3188c23afb4676425bf5bdb647ad | |
| parent | 6094254768e08fd906ce1addc130a6b5c5bb0caa (diff) | |
| download | uhd-08855405d6511774f65d2b7c7a976202e215bb7d.tar.gz uhd-08855405d6511774f65d2b7c7a976202e215bb7d.tar.bz2 uhd-08855405d6511774f65d2b7c7a976202e215bb7d.zip | |
X300: Change default dboard_clock_rate depending on master_clock_rate
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 209fd598f..4a8c12e04 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -887,11 +887,12 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) UHD_LOGGER_DEBUG("X300") << "Setting up RF frontend clocking..."; //Initialize clock control registers. NOTE: This does not configure the LMK yet. + const double requested_mcr = dev_addr.cast<double>("master_clock_rate", X300_DEFAULT_TICK_RATE); mb.clock = x300_clock_ctrl::make(mb.zpu_spi, 1 /*slaveno*/, mb.hw_rev, - dev_addr.cast<double>("master_clock_rate", X300_DEFAULT_TICK_RATE), - dev_addr.cast<double>("dboard_clock_rate", X300_DEFAULT_DBOARD_CLK_RATE), + requested_mcr, + dev_addr.cast<double>("dboard_clock_rate", requested_mcr / 4), dev_addr.cast<double>("system_ref_rate", X300_DEFAULT_SYSREF_RATE)); //Initialize clock source to use internal reference and generate diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index df6af5521..35bd8ce8f 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -37,7 +37,6 @@ static const std::string X300_FW_FILE_NAME = "usrp_x300_fw.bin"; static const std::string X300_DEFAULT_CLOCK_SOURCE = "internal"; static const double X300_DEFAULT_TICK_RATE = 200e6; //Hz -static const double X300_DEFAULT_DBOARD_CLK_RATE = 50e6; //Hz static const double X300_BUS_CLOCK_RATE = 187.5e6; //Hz static const size_t X300_RX_SW_BUFF_SIZE_ETH = 0x2000000;//32MiB For an ~8k frame size any size >32MiB is just wasted buffer space |