diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-23 11:52:32 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:12 -0800 |
| commit | 33c0b32db12ee154b1090360fbf76634590fdd3e (patch) | |
| tree | 1b55e6ca5ea2d08cb5cb2057b900e1bc43a95618 | |
| parent | da2c235bdaddd1f4aa576f08d9ab8e47a25e03e5 (diff) | |
| download | uhd-33c0b32db12ee154b1090360fbf76634590fdd3e.tar.gz uhd-33c0b32db12ee154b1090360fbf76634590fdd3e.tar.bz2 uhd-33c0b32db12ee154b1090360fbf76634590fdd3e.zip | |
lib: Removed more superfluous variables
| -rw-r--r-- | host/lib/usrp/b200/b200_iface.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/common/adf5355.cpp | 12 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_ubx.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 2 |
4 files changed, 8 insertions, 10 deletions
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/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/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: |