diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
| commit | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (patch) | |
| tree | 42d4f30e7a4abc9e47dcd01300a2f44ab1b91510 /host/lib/usrp/common/adf435x_common.cpp | |
| parent | 6a34824ad10eaa2d2b642b959f278f6c4e326d6d (diff) | |
| parent | 61599b3eaadcc46ac8d24974176d7fd89778d06e (diff) | |
| download | uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.gz uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.bz2 uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.zip | |
Merge branch 'master' into ashish/vivado
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"; |