diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 14:33:57 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 14:33:57 -0700 |
| commit | 08467564116f4b948620e831bfd4b5426a43611c (patch) | |
| tree | c62ed26ac3e72dcfef7320d21d866b1ff894eca3 /host/lib/usrp/x300/x300_impl.cpp | |
| parent | 2ba2b35ed3c5fb845a18aa2f0abf68d38b70abc4 (diff) | |
| download | uhd-08467564116f4b948620e831bfd4b5426a43611c.tar.gz uhd-08467564116f4b948620e831bfd4b5426a43611c.tar.bz2 uhd-08467564116f4b948620e831bfd4b5426a43611c.zip | |
gpio: Renamed enums to avoid clash with generic, compiler-provided names
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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(); } } |