diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:11:20 -0700 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:11:20 -0700 | 
| commit | cc0af39a2234c433ff12d02a7d0f58db3e48b10c (patch) | |
| tree | 177fea702fdb55753a6e809db1c96f87b0eb282f /host/lib/usrp/b200 | |
| parent | 2e594ae877f99411d54f1a8e3d9be274d8b9eb35 (diff) | |
| parent | 08467564116f4b948620e831bfd4b5426a43611c (diff) | |
| download | uhd-cc0af39a2234c433ff12d02a7d0f58db3e48b10c.tar.gz uhd-cc0af39a2234c433ff12d02a7d0f58db3e48b10c.tar.bz2 uhd-cc0af39a2234c433ff12d02a7d0f58db3e48b10c.zip  | |
Merge branch 'uhd/gpio_rename'
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 14 | 
1 files changed, 7 insertions, 7 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();      }  }  | 
