aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--host/lib/rfnoc/block_ctrl_base.cpp1
-rw-r--r--host/lib/usrp/common/ad9361_driver/ad9361_device.cpp2
-rw-r--r--host/lib/usrp/cores/rx_frontend_core_3000.cpp1
-rw-r--r--host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp1
4 files changed, 1 insertions, 4 deletions
diff --git a/host/lib/rfnoc/block_ctrl_base.cpp b/host/lib/rfnoc/block_ctrl_base.cpp
index a4e7cb391..24dad6b47 100644
--- a/host/lib/rfnoc/block_ctrl_base.cpp
+++ b/host/lib/rfnoc/block_ctrl_base.cpp
@@ -505,7 +505,6 @@ std::string block_ctrl_base::get_arg(const std::string &key, const size_t port)
}
UHD_THROW_INVALID_CODE_PATH();
- return "";
}
std::string block_ctrl_base::get_arg_type(const std::string &key, const size_t port) const
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
index 58663e8e5..e2ed2c77d 100644
--- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
+++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
@@ -491,8 +491,8 @@ double ad9361_device_t::_calibrate_secondary_tx_filter(double req_rfbw)
} else if ((bbbw_mhz * 2) > 24) {
reg0d0 = 0x57;
} else {
- throw uhd::runtime_error("[ad9361_device_t] Cal2ndTxFil: INVALID_CODE_PATH bad bbbw_mhz");
reg0d0 = 0x00;
+ throw uhd::runtime_error("[ad9361_device_t] Cal2ndTxFil: INVALID_CODE_PATH bad bbbw_mhz");
}
/* Translate resistor values to register settings. */
diff --git a/host/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
index 1c4674a8a..e7d25eb8c 100644
--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
@@ -170,7 +170,6 @@ public:
default:
return _adc_rate;
}
- return _adc_rate;
}
private:
diff --git a/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp b/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp
index 5cc8b49f3..783ded8cc 100644
--- a/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp
+++ b/host/lib/usrp/dboard/twinrx/twinrx_gain_tables.cpp
@@ -836,7 +836,6 @@ const twinrx_gain_table twinrx_gain_table::lookup_table
}
}
throw runtime_error("NO GAIN TABLE SELECTED");
- return twinrx_gain_table(HIGHBAND1_TABLE);
}
const twinrx_gain_config_t& twinrx_gain_table::find_by_index(size_t index) const {