aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-26 15:20:18 -0700
committerJosh Blum <josh@joshknows.com>2010-04-26 15:20:18 -0700
commit6f1bdcb58608e3a7c2625841e3a8f1c6297bb544 (patch)
tree41434e1b13c97538214b7d7c03f660ad921ca965 /host/lib/usrp/dboard
parentb1992806e130216fdab963c2154f489189b8c3b5 (diff)
downloaduhd-6f1bdcb58608e3a7c2625841e3a8f1c6297bb544.tar.gz
uhd-6f1bdcb58608e3a7c2625841e3a8f1c6297bb544.tar.bz2
uhd-6f1bdcb58608e3a7c2625841e3a8f1c6297bb544.zip
Renamed the prop set/get error macros so they make sense for not-implemented properties.
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r--host/lib/usrp/dboard/db_basic_and_lf.cpp8
-rw-r--r--host/lib/usrp/dboard/db_rfx.cpp8
-rw-r--r--host/lib/usrp/dboard/db_xcvr2450.cpp8
3 files changed, 12 insertions, 12 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp
index fa53bd964..b0fbbd2ec 100644
--- a/host/lib/usrp/dboard/db_basic_and_lf.cpp
+++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp
@@ -158,7 +158,7 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){
val = true; //there is no LO, so it must be true!
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -180,7 +180,7 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){
case SUBDEV_PROP_FREQ:
return; // it wont do you much good, but you can set it
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
@@ -257,7 +257,7 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){
val = true; //there is no LO, so it must be true!
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -279,6 +279,6 @@ void basic_tx::tx_set(const wax::obj &key_, const wax::obj &val){
case SUBDEV_PROP_FREQ:
return; // it wont do you much good, but you can set it
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index 6ad5ad906..175f55eab 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -410,7 +410,7 @@ void rfx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
val = this->get_locked(dboard_iface::UNIT_RX);
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -434,7 +434,7 @@ void rfx_xcvr::rx_set(const wax::obj &key_, const wax::obj &val){
set_rx_ant(val.as<std::string>());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
@@ -503,7 +503,7 @@ void rfx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
val = this->get_locked(dboard_iface::UNIT_TX);
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -527,6 +527,6 @@ void rfx_xcvr::tx_set(const wax::obj &key_, const wax::obj &val){
UHD_ASSERT_THROW(val.as<std::string>() == "TX/RX");
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 5b932904d..f1510da10 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -488,7 +488,7 @@ void xcvr2450::rx_get(const wax::obj &key_, wax::obj &val){
val = this->get_locked();
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -511,7 +511,7 @@ void xcvr2450::rx_set(const wax::obj &key_, const wax::obj &val){
this->set_rx_ant(val.as<std::string>());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
@@ -582,7 +582,7 @@ void xcvr2450::tx_get(const wax::obj &key_, wax::obj &val){
val = this->get_locked();
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -605,6 +605,6 @@ void xcvr2450::tx_set(const wax::obj &key_, const wax::obj &val){
this->set_tx_ant(val.as<std::string>());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}