diff options
author | Josh Blum <josh@joshknows.com> | 2010-06-02 15:49:53 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-06-02 15:49:53 -0700 |
commit | 33193a06c1bc197a603f831109533230dc14b4c9 (patch) | |
tree | 9d24eef219b48f9f661a3642efcc36050b1c0f9a /host/lib/usrp/dboard | |
parent | a4494bc2c985919aee7119ed401c72f41cde206e (diff) | |
download | uhd-33193a06c1bc197a603f831109533230dc14b4c9.tar.gz uhd-33193a06c1bc197a603f831109533230dc14b4c9.tar.bz2 uhd-33193a06c1bc197a603f831109533230dc14b4c9.zip |
replaced the assert falses with an invalid code path exception
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r-- | host/lib/usrp/dboard/db_rfx.cpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_wbx.cpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_xcvr2450.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp index 5b90bbbad..17fc00d24 100644 --- a/host/lib/usrp/dboard/db_rfx.cpp +++ b/host/lib/usrp/dboard/db_rfx.cpp @@ -247,7 +247,7 @@ static float rx_pga0_gain_to_dac_volts(float &gain){ void rfx_xcvr::set_tx_gain(float, const std::string &name){ assert_has(rfx_tx_gain_ranges.keys(), name, "rfx tx gain name"); - UHD_ASSERT_THROW(false); //no gains to set + UHD_THROW_INVALID_CODE_PATH(); //no gains to set } void rfx_xcvr::set_rx_gain(float gain, const std::string &name){ @@ -259,7 +259,7 @@ void rfx_xcvr::set_rx_gain(float gain, const std::string &name){ //write the new voltage to the aux dac this->get_iface()->write_aux_dac(dboard_iface::UNIT_RX, 1, dac_volts); } - else UHD_ASSERT_THROW(false); + else UHD_THROW_INVALID_CODE_PATH(); } /*********************************************************************** diff --git a/host/lib/usrp/dboard/db_wbx.cpp b/host/lib/usrp/dboard/db_wbx.cpp index 4cf168c6b..95dcb3802 100644 --- a/host/lib/usrp/dboard/db_wbx.cpp +++ b/host/lib/usrp/dboard/db_wbx.cpp @@ -248,7 +248,7 @@ void wbx_xcvr::set_tx_gain(float gain, const std::string &name){ //write the new voltage to the aux dac this->get_iface()->write_aux_dac(dboard_iface::UNIT_TX, 0, dac_volts); } - else UHD_ASSERT_THROW(false); + else UHD_THROW_INVALID_CODE_PATH(); } void wbx_xcvr::set_rx_gain(float gain, const std::string &name){ @@ -260,7 +260,7 @@ void wbx_xcvr::set_rx_gain(float gain, const std::string &name){ //write the new gain to atr regs update_atr(); } - else UHD_ASSERT_THROW(false); + else UHD_THROW_INVALID_CODE_PATH(); } /*********************************************************************** diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp index d4d5f184e..974a378bd 100644 --- a/host/lib/usrp/dboard/db_xcvr2450.cpp +++ b/host/lib/usrp/dboard/db_xcvr2450.cpp @@ -375,7 +375,7 @@ static max2829_regs_t::tx_baseband_gain_t gain_to_tx_bb_reg(float &gain){ gain = 5; return max2829_regs_t::TX_BASEBAND_GAIN_5DB; } - UHD_ASSERT_THROW(false); + UHD_THROW_INVALID_CODE_PATH(); } /*! @@ -417,7 +417,7 @@ void xcvr2450::set_tx_gain(float gain, const std::string &name){ _max2829_regs.tx_baseband_gain = gain_to_tx_bb_reg(gain); send_reg(0x9); } - else UHD_ASSERT_THROW(false); + else UHD_THROW_INVALID_CODE_PATH(); _tx_gains[name] = gain; } @@ -431,7 +431,7 @@ void xcvr2450::set_rx_gain(float gain, const std::string &name){ _max2829_regs.rx_lna_gain = gain_to_rx_lna_reg(gain); send_reg(0xB); } - else UHD_ASSERT_THROW(false); + else UHD_THROW_INVALID_CODE_PATH(); _rx_gains[name] = gain; } |