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/cores | |
| 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/cores')
| -rw-r--r-- | host/lib/usrp/cores/gpio_core_200.hpp | 21 |
1 files changed, 19 insertions, 2 deletions
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: |