summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
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/usrp2
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/usrp2')
-rw-r--r--host/lib/usrp/usrp2/dboard_impl.cpp8
-rw-r--r--host/lib/usrp/usrp2/dsp_impl.cpp8
-rw-r--r--host/lib/usrp/usrp2/mboard_impl.cpp4
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.cpp4
4 files changed, 12 insertions, 12 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 226a7950d..403faf5cf 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -123,7 +123,7 @@ void usrp2_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
val = _rx_db_eeprom.id;
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -139,7 +139,7 @@ void usrp2_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){
_iface->write_eeprom(I2C_ADDR_RX_DB, 0, _rx_db_eeprom.get_eeprom_bytes());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
@@ -172,7 +172,7 @@ void usrp2_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
val = _tx_db_eeprom.id;
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -188,6 +188,6 @@ void usrp2_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val){
_iface->write_eeprom(I2C_ADDR_TX_DB, 0, _tx_db_eeprom.get_eeprom_bytes());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 84c50ac0d..84314a656 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -118,7 +118,7 @@ void usrp2_impl::ddc_get(const wax::obj &key, wax::obj &val){
val = get_master_clock_freq()/_ddc_decim;
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -141,7 +141,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
}
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
@@ -202,7 +202,7 @@ void usrp2_impl::duc_get(const wax::obj &key, wax::obj &val){
val = get_master_clock_freq()/_duc_interp;
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -225,6 +225,6 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
}
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 684cf245d..36bef4f25 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -248,7 +248,7 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){
val = _clock_config;
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
@@ -304,6 +304,6 @@ void usrp2_impl::mboard_set(const wax::obj &key, const wax::obj &val){
issue_ddc_stream_cmd(val.as<stream_cmd_t>());
return;
- default: UHD_THROW_PROP_READ_ONLY();
+ default: UHD_THROW_PROP_SET_ERROR();
}
}
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index d9b2248ff..4079357f9 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -202,10 +202,10 @@ void usrp2_impl::get(const wax::obj &key_, wax::obj &val){
val = size_t(_max_tx_samples_per_packet);
return;
- default: UHD_THROW_PROP_WRITE_ONLY();
+ default: UHD_THROW_PROP_GET_ERROR();
}
}
void usrp2_impl::set(const wax::obj &, const wax::obj &){
- UHD_THROW_PROP_READ_ONLY();
+ UHD_THROW_PROP_SET_ERROR();
}