Merge branch 'uhd/gpio_rename'

4 files changed, 40 insertions, 23 deletions

diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index 693109b1b..647c64695 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -925,13 +925,13 @@ void b200_impl::set_fp_gpio(gpio_core_200::sptr gpio, const gpio_attr_t attr, co
 {
     switch (attr)
     {
-    case CTRL:      return gpio->set_pin_ctrl(dboard_iface::UNIT_RX, value);
-    case DDR:       return gpio->set_gpio_ddr(dboard_iface::UNIT_RX, value);
-    case OUT:       return gpio->set_gpio_out(dboard_iface::UNIT_RX, value);
-    case ATR_0X:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, value);
-    case ATR_RX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, value);
-    case ATR_TX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, value);
-    case ATR_XX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, value);
+    case GPIO_CTRL:   return gpio->set_pin_ctrl(dboard_iface::UNIT_RX, value);
+    case GPIO_DDR:    return gpio->set_gpio_ddr(dboard_iface::UNIT_RX, value);
+    case GPIO_OUT:    return gpio->set_gpio_out(dboard_iface::UNIT_RX, value);
+    case GPIO_ATR_0X: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, value);
+    case GPIO_ATR_RX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, value);
+    case GPIO_ATR_TX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, value);
+    case GPIO_ATR_XX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, value);
     default:        UHD_THROW_INVALID_CODE_PATH();
     }
 }
diff --git a/host/lib/usrp/cores/gpio_core_200.hpp b/host/lib/usrp/cores/gpio_core_200.hpp
index a76cced01..e22834fd9 100644
--- a/host/lib/usrp/cores/gpio_core_200.hpp
+++ b/host/lib/usrp/cores/gpio_core_200.hpp
@@ -27,10 +27,27 @@
 #include <uhd/types/wb_iface.hpp>
 #include <map>
 
-typedef enum{CTRL,DDR,OUT,ATR_0X,ATR_RX,ATR_TX,ATR_XX} gpio_attr_t;
+typedef enum {
+    GPIO_CTRL,
+    GPIO_DDR,
+    GPIO_OUT,
+    GPIO_ATR_0X,
+    GPIO_ATR_RX,
+    GPIO_ATR_TX,
+    GPIO_ATR_XX
+} gpio_attr_t;
+
 typedef std::map<gpio_attr_t,std::string> gpio_attr_map_t;
 static const gpio_attr_map_t gpio_attr_map =
-    boost::assign::map_list_of(CTRL,"CTRL")(DDR,"DDR")(OUT,"OUT")(ATR_0X,"ATR_0X")(ATR_RX,"ATR_RX")(ATR_TX,"ATR_TX")(ATR_XX,"ATR_XX");
+    boost::assign::map_list_of
+        (GPIO_CTRL,   "CTRL")
+        (GPIO_DDR,    "DDR")
+        (GPIO_OUT,    "OUT")
+        (GPIO_ATR_0X, "ATR_0X")
+        (GPIO_ATR_RX, "ATR_RX")
+        (GPIO_ATR_TX, "ATR_TX")
+        (GPIO_ATR_XX, "ATR_XX")
+;
 
 class gpio_core_200 : boost::noncopyable{
 public:
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index ac92f9a12..8be3e47c9 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -587,19 +587,19 @@ void e300_impl::_set_internal_gpio(
 {
     switch (attr)
     {
-    case CTRL:
+    case GPIO_CTRL:
         return gpio->set_pin_ctrl(dboard_iface::UNIT_RX, value);
-    case DDR:
+    case GPIO_DDR:
         return gpio->set_gpio_ddr(dboard_iface::UNIT_RX, value);
-    case OUT:
+    case GPIO_OUT:
         return gpio->set_gpio_out(dboard_iface::UNIT_RX, value);
-    case ATR_0X:
+    case GPIO_ATR_0X:
         return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, value);
-    case ATR_RX:
+    case GPIO_ATR_RX:
         return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, value);
-    case ATR_TX:
+    case GPIO_ATR_TX:
         return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, value);
-    case ATR_XX:
+    case GPIO_ATR_XX:
         return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, value);
     default:
         UHD_THROW_INVALID_CODE_PATH();
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index a82be543d..d9b27b6b4 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1542,13 +1542,13 @@ void x300_impl::set_fp_gpio(gpio_core_200::sptr gpio, const gpio_attr_t attr, co
 {
     switch (attr)
     {
-    case CTRL:      return gpio->set_pin_ctrl(dboard_iface::UNIT_RX, value);
-    case DDR:       return gpio->set_gpio_ddr(dboard_iface::UNIT_RX, value);
-    case OUT:       return gpio->set_gpio_out(dboard_iface::UNIT_RX, value);
-    case ATR_0X:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, value);
-    case ATR_RX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, value);
-    case ATR_TX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, value);
-    case ATR_XX:    return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, value);
+    case GPIO_CTRL:   return gpio->set_pin_ctrl(dboard_iface::UNIT_RX, value);
+    case GPIO_DDR:    return gpio->set_gpio_ddr(dboard_iface::UNIT_RX, value);
+    case GPIO_OUT:    return gpio->set_gpio_out(dboard_iface::UNIT_RX, value);
+    case GPIO_ATR_0X: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, value);
+    case GPIO_ATR_RX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, value);
+    case GPIO_ATR_TX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, value);
+    case GPIO_ATR_XX: return gpio->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, value);
     default:        UHD_THROW_INVALID_CODE_PATH();
     }
 }