diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-11 19:13:22 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-11 19:13:22 -0800 |
commit | b08ac6273fa6dd1e757ecaeb0b316592696099f7 (patch) | |
tree | 09ac154ab9feee90a5ac41c043c45f75448baefe /host/lib/usrp/dboard | |
parent | f22303e6e4a2f425d588439cc05f8b04ef79c1d2 (diff) | |
download | uhd-b08ac6273fa6dd1e757ecaeb0b316592696099f7.tar.gz uhd-b08ac6273fa6dd1e757ecaeb0b316592696099f7.tar.bz2 uhd-b08ac6273fa6dd1e757ecaeb0b316592696099f7.zip |
uhd: removed windows warnings, added string formatting in usrp-n
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r-- | host/lib/usrp/dboard/db_dbsrx2.cpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_rfx.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp index bf5528688..cdafd6a78 100644 --- a/host/lib/usrp/dboard/db_dbsrx2.cpp +++ b/host/lib/usrp/dboard/db_dbsrx2.cpp @@ -203,7 +203,7 @@ dbsrx2::dbsrx2(ctor_args_t args) : rx_dboard_base(args){ set_bandwidth(40e6); // default bandwidth from datasheet get_locked(); - _max2112_write_regs.bbg = dbsrx2_gain_ranges["BBG"].start(); + _max2112_write_regs.bbg = boost::math::iround(dbsrx2_gain_ranges["BBG"].start()); send_reg(0x9, 0x9); } diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp index 4e73fb3a3..74a9fb37b 100644 --- a/host/lib/usrp/dboard/db_rfx.cpp +++ b/host/lib/usrp/dboard/db_rfx.cpp @@ -171,7 +171,7 @@ rfx_xcvr::rfx_xcvr( ): xcvr_dboard_base(args), _freq_range(freq_range), - _rx_gain_ranges((this->get_rx_id() == 0x0024)? + _rx_gain_ranges((get_rx_id() == 0x0024)? rfx400_rx_gain_ranges : rfx_rx_gain_ranges ), _div2(map_list_of |