diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-25 19:02:26 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-25 19:02:26 -0700 |
| commit | 60fc0f04a2b8499afa960653d793b782aef2bb6d (patch) | |
| tree | be44de1534c628944c4599757657af774632a636 /host/lib/usrp/dboard | |
| parent | 0019bb05437702a6727d3632c6efc6a600bb4aa2 (diff) | |
| parent | 48ad3b734314bdec2128dacb20b09fd4cf1f5979 (diff) | |
| download | uhd-60fc0f04a2b8499afa960653d793b782aef2bb6d.tar.gz uhd-60fc0f04a2b8499afa960653d793b782aef2bb6d.tar.bz2 uhd-60fc0f04a2b8499afa960653d793b782aef2bb6d.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/include/uhd/usrp/simple_usrp.hpp
host/lib/usrp/simple_usrp.cpp
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 |