Merge branch 'maint'

8 files changed, 9 insertions, 20 deletions

diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index d0b9d835d..1a38bf3b7 100644
--- a/host/lib/usrp/b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
@@ -39,8 +39,6 @@ using namespace uhd::transport;
 
 const uint16_t B100_VENDOR_ID  = 0x2500;
 const uint16_t B100_PRODUCT_ID = 0x0002;
-const uint16_t FX2_VENDOR_ID    = 0x04b4;
-const uint16_t FX2_PRODUCT_ID   = 0x8613;
 static const boost::posix_time::milliseconds REENUMERATION_TIMEOUT_MS(3000);
 
 /***********************************************************************
diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp
index 4e6dd2144..6f9bdd330 100644
--- a/host/lib/usrp/b200/b200_iface.cpp
+++ b/host/lib/usrp/b200/b200_iface.cpp
@@ -59,7 +59,7 @@ const static uint8_t B200_VREQ_SET_FW_HASH = 0x1E;
 const static uint8_t B200_VREQ_GET_FW_HASH = 0x1F;
 const static uint8_t B200_VREQ_LOOP = 0x22;
 const static uint8_t B200_VREQ_FPGA_CONFIG = 0x55;
-const static uint8_t B200_VREQ_FPGA_RESET = 0x62;
+//const static uint8_t B200_VREQ_FPGA_RESET = 0x62;
 const static uint8_t B200_VREQ_GPIF_RESET = 0x72;
 const static uint8_t B200_VREQ_GET_USB = 0x80;
 const static uint8_t B200_VREQ_GET_STATUS = 0x83;
diff --git a/host/lib/usrp/common/adf5355.cpp b/host/lib/usrp/common/adf5355.cpp
index ee9b54622..ee9d1d1d9 100644
--- a/host/lib/usrp/common/adf5355.cpp
+++ b/host/lib/usrp/common/adf5355.cpp
@@ -34,21 +34,21 @@ double todbl(data_t val) {
 }
 
 static const double ADF5355_DOUBLER_MAX_REF_FREQ    = 60e6;
-static const double ADF5355_MAX_FREQ_PFD            = 125e6;
-static const double ADF5355_PRESCALER_THRESH        = 7e9;
+//static const double ADF5355_MAX_FREQ_PFD            = 125e6;
+//static const double ADF5355_PRESCALER_THRESH        = 7e9;
 
 static const double ADF5355_MIN_VCO_FREQ            = 3.4e9;
-static const double ADF5355_MAX_VCO_FREQ            = 6.8e9;
+//static const double ADF5355_MAX_VCO_FREQ            = 6.8e9;
 static const double ADF5355_MAX_OUT_FREQ            = 6.8e9;
 static const double ADF5355_MIN_OUT_FREQ            = (3.4e9 / 64);
-static const double ADF5355_MAX_OUTB_FREQ           = (6.8e9 * 2);
-static const double ADF5355_MIN_OUTB_FREQ           = (3.4e9 * 2);
+//static const double ADF5355_MAX_OUTB_FREQ           = (6.8e9 * 2);
+//static const double ADF5355_MIN_OUTB_FREQ           = (3.4e9 * 2);
 
 static const double ADF5355_PHASE_RESYNC_TIME       = 400e-6;
 
 static const uint32_t ADF5355_MOD1           = 16777216;
 static const uint32_t ADF5355_MAX_MOD2       = 16384;
-static const uint16_t ADF5355_MIN_INT_PRESCALER_89 = 75;
+//static const uint16_t ADF5355_MIN_INT_PRESCALER_89 = 75;
 
 class adf5355_impl : public adf5355_iface
 {
diff --git a/host/lib/usrp/cores/dma_fifo_core_3000.cpp b/host/lib/usrp/cores/dma_fifo_core_3000.cpp
index 908ba906e..e1a841b96 100644
--- a/host/lib/usrp/cores/dma_fifo_core_3000.cpp
+++ b/host/lib/usrp/cores/dma_fifo_core_3000.cpp
@@ -223,7 +223,7 @@ public:
 
 public:
     dma_fifo_core_3000_impl(wb_iface::sptr iface, const size_t base, const size_t readback):
-        _iface(iface), _base(base), _fifo_readback(iface, base, readback),
+        _iface(iface), _fifo_readback(iface, base, readback),
         _fifo_ctrl_reg(base), _base_addr_reg(base), _addr_mask_reg(base),
         _bist_ctrl_reg(base), _bist_cfg_reg(base), _bist_delay_reg(base), _bist_sid_reg(base)
     {
@@ -368,7 +368,6 @@ private:
 
 private:
     wb_iface::sptr  _iface;
-    const size_t    _base;
     boost::mutex    _mutex;
     bool            _has_ext_bist;
 
diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp
index 05a02c321..82472fd9b 100644
--- a/host/lib/usrp/dboard/db_ubx.cpp
+++ b/host/lib/usrp/dboard/db_ubx.cpp
@@ -1246,8 +1246,6 @@ private:
     power_mode_t _power_mode;
     std::string _xcvr_mode;
     size_t _rev;
-    double _prev_tx_freq;
-    double _prev_rx_freq;
     ubx_gpio_reg_t _tx_gpio_reg;
     ubx_gpio_reg_t _rx_gpio_reg;
     int64_t _tx_sync_delay;
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index baecc6081..09352c5e0 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -38,8 +38,6 @@ using namespace uhd::transport;
 
 const uint16_t USRP1_VENDOR_ID  = 0xfffe;
 const uint16_t USRP1_PRODUCT_ID = 0x0002;
-const uint16_t FX2_VENDOR_ID    = 0x04b4;
-const uint16_t FX2_PRODUCT_ID   = 0x8613;
 static const boost::posix_time::milliseconds REENUMERATION_TIMEOUT_MS(3000);
 
 const std::vector<usrp1_impl::dboard_slot_t> usrp1_impl::_dboard_slots = boost::assign::list_of
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index ae39028a1..199436fa2 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -50,10 +50,6 @@ static UHD_INLINE pt::time_duration to_time_dur(double timeout){
     return pt::microseconds(long(timeout*1e6));
 }
 
-static UHD_INLINE double from_time_dur(const pt::time_duration &time_dur){
-    return 1e-6*time_dur.total_microseconds();
-}
-
 /***********************************************************************
  * constants
  **********************************************************************/
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 522d6c6d0..021f0e3e5 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -62,7 +62,7 @@ static const uint32_t MIN_PROTO_COMPAT_I2C = 7;
 // The register compat number must reflect the protocol compatibility
 // and the compatibility of the register mapping (more likely to change).
 static const uint32_t MIN_PROTO_COMPAT_REG = 10;
-static const uint32_t MIN_PROTO_COMPAT_UART = 7;
+//static const uint32_t MIN_PROTO_COMPAT_UART = 7;
 
 class usrp2_iface_impl : public usrp2_iface{
 public: