diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
| commit | 88ffeb35dadb3d10593be39c9eae2f90c4d7c008 (patch) | |
| tree | 4dc3fb96097260c3eb46e45ebba39c17efb3af7a /host/lib/usrp/common/adf435x_common.cpp | |
| parent | 5b285598d367b936caf91b615e30e90af8af2a5d (diff) | |
| parent | 1200721b696751edaceb70a332861f84fb8c16d5 (diff) | |
| download | uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.gz uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.bz2 uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/common/adf435x_common.cpp')
| -rw-r--r-- | host/lib/usrp/common/adf435x_common.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/common/adf435x_common.cpp b/host/lib/usrp/common/adf435x_common.cpp index 9b362a4d9..474a1c932 100644 --- a/host/lib/usrp/common/adf435x_common.cpp +++ b/host/lib/usrp/common/adf435x_common.cpp @@ -129,11 +129,11 @@ adf435x_tuning_settings tune_adf435x_synth( settings.frac_12_bit = FRAC; settings.int_16_bit = N; settings.mod_12_bit = MOD; - settings.clock_divider_12_bit = std::max<boost::uint16_t>(1, std::ceil(PHASE_RESYNC_TIME*pfd_freq/MOD)); + settings.clock_divider_12_bit = std::max<boost::uint16_t>(1, boost::uint16_t(std::ceil(PHASE_RESYNC_TIME*pfd_freq/MOD))); settings.r_counter_10_bit = R; settings.r_divide_by_2_en = T; settings.r_doubler_en = D; - settings.band_select_clock_div = BS; + settings.band_select_clock_div = boost::uint8_t(BS); settings.rf_divider = RFdiv; std::string tuning_str = (constraints.force_frac0) ? "Integer-N" : "Fractional"; |