diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-03-27 09:35:29 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2015-03-27 09:35:29 -0700 |
| commit | 1200721b696751edaceb70a332861f84fb8c16d5 (patch) | |
| tree | 15a56b1a54b5b059779d00115a9f58af991035ac /host/lib/usrp/common/adf435x_common.cpp | |
| parent | a712b026a806cd1c106d62fd9278536fcc0a8b62 (diff) | |
| download | uhd-1200721b696751edaceb70a332861f84fb8c16d5.tar.gz uhd-1200721b696751edaceb70a332861f84fb8c16d5.tar.bz2 uhd-1200721b696751edaceb70a332861f84fb8c16d5.zip | |
Warning fixes
* CMake now not applying C++ flags to C files
* GCC 4.4: anti-aliasing rules
* MSVC: narrowing, differences in subclass function parameters
* Clang: uninitialized variables
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"; |