From 7c3867da33250e5a20d26f64c5a127323c2094cc Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sat, 6 Apr 2013 22:07:54 +0000 Subject: Added new CONCAT() and CONCAT_EXPANDED() convenience macros. --- LUFA/Drivers/USB/Core/USBTask.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'LUFA/Drivers/USB/Core/USBTask.h') diff --git a/LUFA/Drivers/USB/Core/USBTask.h b/LUFA/Drivers/USB/Core/USBTask.h index 88971e770..9d7b7e5d6 100644 --- 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 - #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 @@ -145,9 +143,7 @@ */ 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 -- cgit v1.2.3