diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:00:39 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:05:10 -0700 |
commit | 2e594ae877f99411d54f1a8e3d9be274d8b9eb35 (patch) | |
tree | 2fa0a5f0fc501ab2362f424831b367610077c2d6 /host/lib/usrp/dboard/db_cbx.cpp | |
parent | a7049e4ff79cdc205db76bf7270219f254073961 (diff) | |
parent | cc7d37f114d5a14b4e45372f38324bf95115b6b9 (diff) | |
download | uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.gz uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.bz2 uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.zip |
Merge branch 'maint'
Conflicts:
host/include/uhd/transport/vrt_if_packet.hpp
Diffstat (limited to 'host/lib/usrp/dboard/db_cbx.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_cbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp index db7f84932..ad255460e 100644 --- a/host/lib/usrp/dboard/db_cbx.cpp +++ b/host/lib/usrp/dboard/db_cbx.cpp @@ -142,7 +142,7 @@ double sbx_xcvr::cbx::set_lo_freq(dboard_iface::unit_t unit, double target_freq) } //keep pfd freq low enough to achieve 50kHz BS clock - BS = std::ceil(pfd_freq / 50e3); + BS = int(std::ceil(pfd_freq / 50e3)); if(BS <= 1023) break; } |