uhd: removed windows warnings, added string formatting in usrp-n

6 files changed, 15 insertions, 15 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
diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp
index 998d55297..e417bc340 100644
--- a/host/lib/usrp/usrp2/codec_impl.cpp
+++ b/host/lib/usrp/usrp2/codec_impl.cpp
@@ -30,9 +30,9 @@ using namespace boost::assign;
 
 //this only applies to USRP2P
 static const uhd::dict<std::string, gain_range_t> codec_rx_gain_ranges = map_list_of
-                                  ("analog", gain_range_t(0, 3.5, 3.5))
-                                  ("digital", gain_range_t(0, 6.0, 0.5))
-                                  ("digital-fine", gain_range_t(0, 0.5, 0.05));
+                                  ("analog", gain_range_t(0, float(3.5), float(3.5)))
+                                  ("digital", gain_range_t(0, float(6.0), float(0.5)))
+                                  ("digital-fine", gain_range_t(0, float(0.5), float(0.05)));
 
 
 /***********************************************************************
@@ -62,16 +62,16 @@ void usrp2_mboard_impl::rx_codec_get(const wax::obj &key_, wax::obj &val){
         switch(_iface->get_rev()){
         case usrp2_iface::USRP_N200:
         case usrp2_iface::USRP_N210:
-            val = std::string(_iface->get_cname() + " adc - ads62p44");
+            val = _iface->get_cname() + " adc - ads62p44";
             break;
 
         case usrp2_iface::USRP2_REV3:
         case usrp2_iface::USRP2_REV4:
-            val = std::string(_iface->get_cname() + " adc - ltc2284");
+            val = _iface->get_cname() + " adc - ltc2284";
             break;
 
         case usrp2_iface::USRP_NXXX:
-            val = std::string(_iface->get_cname() + " adc - ??????");
+            val = _iface->get_cname() + " adc - ??????";
             break;
         }
         return;
@@ -153,7 +153,7 @@ void usrp2_mboard_impl::tx_codec_get(const wax::obj &key_, wax::obj &val){
     //handle the get request conditioned on the key
     switch(key.as<codec_prop_t>()){
     case CODEC_PROP_NAME:
-        val = std::string(_iface->get_cname() + " dac - ad9777");
+        val = _iface->get_cname() + " dac - ad9777";
         return;
 
     case CODEC_PROP_OTHERS:
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index f839a4058..4192c4f78 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -64,7 +64,7 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
     //handle the get request conditioned on the key
     switch(key.as<dboard_prop_t>()){
     case DBOARD_PROP_NAME:
-        val = std::string(_iface->get_cname() + " dboard (rx unit)");
+        val = _iface->get_cname() + " dboard (rx unit)";
         return;
 
     case DBOARD_PROP_SUBDEV:
@@ -121,7 +121,7 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
     //handle the get request conditioned on the key
     switch(key.as<dboard_prop_t>()){
     case DBOARD_PROP_NAME:
-        val = std::string(_iface->get_cname() + " dboard (tx unit)");
+        val = _iface->get_cname() + " dboard (tx unit)";
         return;
 
     case DBOARD_PROP_SUBDEV:
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 243a8e905..77ed594f5 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -61,7 +61,7 @@ void usrp2_mboard_impl::ddc_get(const wax::obj &key_, wax::obj &val){
 
     switch(key.as<dsp_prop_t>()){
     case DSP_PROP_NAME:
-        val = std::string(_iface->get_cname() + " ddc0");
+        val = _iface->get_cname() + " ddc0";
         return;
 
     case DSP_PROP_OTHERS:
@@ -144,7 +144,7 @@ void usrp2_mboard_impl::duc_get(const wax::obj &key_, wax::obj &val){
 
     switch(key.as<dsp_prop_t>()){
     case DSP_PROP_NAME:
-        val = std::string(_iface->get_cname() + " duc0");
+        val = _iface->get_cname() + " duc0";
         return;
 
     case DSP_PROP_OTHERS:
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 7208a47cf..2b32faffb 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -274,8 +274,8 @@ public:
 
     rev_type get_rev(void){
         switch (boost::lexical_cast<boost::uint16_t>(mb_eeprom["rev"])){
-        case 0x0003: return USRP2_REV3;
-        case 0x0004: return USRP2_REV4;
+        case 0x0300: return USRP2_REV3;
+        case 0x0400: return USRP2_REV4;
         case 0x0A00: return USRP_N200;
         case 0x0A01: return USRP_N210;
         }