diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-24 17:34:24 +0000 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-24 17:34:24 +0000 |
commit | e0d55c79f5e61858dbe75ca96abfbd7a6a4e8f97 (patch) | |
tree | 24cc392414a06d822e056baff66f81d41c567fc7 /host/lib/usrp/dboard | |
parent | 038189c02b369788f5fc32ee330b814499cec407 (diff) | |
parent | 48ad3b734314bdec2128dacb20b09fd4cf1f5979 (diff) | |
download | uhd-e0d55c79f5e61858dbe75ca96abfbd7a6a4e8f97.tar.gz uhd-e0d55c79f5e61858dbe75ca96abfbd7a6a4e8f97.tar.bz2 uhd-e0d55c79f5e61858dbe75ca96abfbd7a6a4e8f97.zip |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index f8236d598..0b6e4a75a 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -170,8 +170,8 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){ return; case SUBDEV_PROP_ANTENNA: - UHD_ASSERT_THROW(val.as<std::string>() == std::string("")); - return; + if (val.as<std::string>().empty()) return; + throw std::runtime_error("no selectable antennas on this board"); case SUBDEV_PROP_FREQ: return; // it wont do you much good, but you can set it @@ -259,8 +259,8 @@ void basic_tx::tx_set(const wax::obj &key_, const wax::obj &val){ return; case SUBDEV_PROP_ANTENNA: - UHD_ASSERT_THROW(val.as<std::string>() == std::string("")); - return; + if (val.as<std::string>().empty()) return; + throw std::runtime_error("no selectable antennas on this board"); case SUBDEV_PROP_FREQ: return; // it wont do you much good, but you can set it |