summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-26 23:27:53 -0500
committerJosh Blum <josh@joshknows.com>2010-11-26 23:27:53 -0500
commit9a2e26e5004d3f740c9690ad8b0b85debcb51c7a (patch)
tree00f1027792da8c466fffd6743cca4f915ca70b40 /host/lib/usrp/usrp1
parent2568efd1ead77cd6c459e8f2580466a923bb4ba7 (diff)
downloaduhd-9a2e26e5004d3f740c9690ad8b0b85debcb51c7a.tar.gz
uhd-9a2e26e5004d3f740c9690ad8b0b85debcb51c7a.tar.bz2
uhd-9a2e26e5004d3f740c9690ad8b0b85debcb51c7a.zip
uhd: added read-back calls to dboard iface gpio settings, and optional mask
Diffstat (limited to 'host/lib/usrp/usrp1')
-rw-r--r--host/lib/usrp/usrp1/dboard_iface.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp
index 1ac15a46a..70ce3da76 100644
--- a/host/lib/usrp/usrp1/dboard_iface.cpp
+++ b/host/lib/usrp/usrp1/dboard_iface.cpp
@@ -75,10 +75,10 @@ public:
void write_aux_dac(unit_t, aux_dac_t, float);
float read_aux_adc(unit_t, aux_adc_t);
- void set_pin_ctrl(unit_t, boost::uint16_t);
- void set_atr_reg(unit_t, atr_reg_t, boost::uint16_t);
- void set_gpio_ddr(unit_t, boost::uint16_t);
- void write_gpio(unit_t, boost::uint16_t);
+ void _set_pin_ctrl(unit_t, boost::uint16_t);
+ void _set_atr_reg(unit_t, atr_reg_t, boost::uint16_t);
+ void _set_gpio_ddr(unit_t, boost::uint16_t);
+ void _set_gpio_out(unit_t, boost::uint16_t);
void set_gpio_debug(unit_t, int);
boost::uint16_t read_gpio(unit_t);
@@ -184,7 +184,7 @@ double usrp1_dboard_iface::get_codec_rate(unit_t){
/***********************************************************************
* GPIO
**********************************************************************/
-void usrp1_dboard_iface::set_pin_ctrl(unit_t unit, boost::uint16_t value)
+void usrp1_dboard_iface::_set_pin_ctrl(unit_t unit, boost::uint16_t value)
{
switch(unit) {
case UNIT_RX:
@@ -202,7 +202,7 @@ void usrp1_dboard_iface::set_pin_ctrl(unit_t unit, boost::uint16_t value)
}
}
-void usrp1_dboard_iface::set_gpio_ddr(unit_t unit, boost::uint16_t value)
+void usrp1_dboard_iface::_set_gpio_ddr(unit_t unit, boost::uint16_t value)
{
switch(unit) {
case UNIT_RX:
@@ -220,7 +220,7 @@ void usrp1_dboard_iface::set_gpio_ddr(unit_t unit, boost::uint16_t value)
}
}
-void usrp1_dboard_iface::write_gpio(unit_t unit, boost::uint16_t value)
+void usrp1_dboard_iface::_set_gpio_out(unit_t unit, boost::uint16_t value)
{
switch(unit) {
case UNIT_RX:
@@ -263,7 +263,7 @@ boost::uint16_t usrp1_dboard_iface::read_gpio(unit_t unit)
UHD_ASSERT_THROW(false);
}
-void usrp1_dboard_iface::set_atr_reg(unit_t unit,
+void usrp1_dboard_iface::_set_atr_reg(unit_t unit,
atr_reg_t atr, boost::uint16_t value)
{
// Ignore unsupported states