Added new CONCAT() and CONCAT_EXPANDED() convenience macros.

[pub/lufa.git] / LUFA / Drivers / USB / Core / USBTask.h

diff --git a/LUFA/Drivers/USB/Core/USBTask.h b/LUFA/Drivers/USB/Core/USBTask.h
index 88971e7..9d7b7e5 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBTask.h
+++ b/LUFA/Drivers/USB/Core/USBTask.h
@@ -112,9 +112,7 @@
                                         */
                                        extern volatile uint8_t USB_HostState;
                                #else
                                         */
                                        extern volatile uint8_t USB_HostState;
                                #else

-                                       #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y
-                                       #define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)
-                                       #define USB_HostState            _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)
+                                       #define USB_HostState            CONCAT_EXPANDED(GPIOR, HOST_STATE_AS_GPIOR)

                                #endif
                        #endif
 
                                #endif
                        #endif
 


@@ -145,9 +143,7 @@
                                         */
                                        extern volatile uint8_t USB_DeviceState;
                                #else
                                         */
                                        extern volatile uint8_t USB_DeviceState;
                                #else

-                                       #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y
-                                       #define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)
-                                       #define USB_DeviceState            _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)
+                                       #define USB_DeviceState            CONCAT_EXPANDED(GPIOR, DEVICE_STATE_AS_GPIOR)

                                #endif
                        #endif
 
                                #endif
                        #endif