diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
| commit | 088b852844692e9d366e3e44336883adf0305623 (patch) | |
| tree | c25d8faef3a3364a3716c4a935c6a60c7d6515dc /host/lib | |
| parent | 2bdc0e2e31a302fb6016d0338c68acb13612e398 (diff) | |
| parent | 1a002d38ac27656d0bae4a06314add0f586195d1 (diff) | |
| download | uhd-088b852844692e9d366e3e44336883adf0305623.tar.gz uhd-088b852844692e9d366e3e44336883adf0305623.tar.bz2 uhd-088b852844692e9d366e3e44336883adf0305623.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/cores/gpio_core_200.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/cores/gpio_core_200.cpp b/host/lib/usrp/cores/gpio_core_200.cpp index 57a52405c..8223a0bbf 100644 --- a/host/lib/usrp/cores/gpio_core_200.cpp +++ b/host/lib/usrp/cores/gpio_core_200.cpp @@ -132,10 +132,10 @@ private: addr = REG_GPIO_TX_ONLY; break; case gpio_atr::ATR_REG_RX_ONLY: - addr = REG_GPIO_IDLE; + addr = REG_GPIO_RX_ONLY; break; case gpio_atr::ATR_REG_FULL_DUPLEX: - addr = REG_GPIO_RX_ONLY; + addr = REG_GPIO_BOTH; break; default: UHD_THROW_INVALID_CODE_PATH(); |