diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-06 22:07:54 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-06 22:07:54 +0000 |
| commit | 7c3867da33250e5a20d26f64c5a127323c2094cc (patch) | |
| tree | 6c0bc8892eaf7d7767e20bb1d2296389fd13b959 /LUFA/Drivers/USB | |
| parent | 7dc77a6abc7f3a86970ca48d355b55ed5931a350 (diff) | |
| download | lufa-7c3867da33250e5a20d26f64c5a127323c2094cc.tar.gz lufa-7c3867da33250e5a20d26f64c5a127323c2094cc.tar.bz2 lufa-7c3867da33250e5a20d26f64c5a127323c2094cc.zip | |
Added new CONCAT() and CONCAT_EXPANDED() convenience macros.
Diffstat (limited to 'LUFA/Drivers/USB')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/HIDReportData.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/USBTask.h | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/Class/Common/HIDReportData.h b/LUFA/Drivers/USB/Class/Common/HIDReportData.h index 0d9a52156..b5825a93e 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDReportData.h +++ b/LUFA/Drivers/USB/Class/Common/HIDReportData.h @@ -61,13 +61,13 @@ #define HID_RI_DATA_BITS_8 0x01 #define HID_RI_DATA_BITS_16 0x02 #define HID_RI_DATA_BITS_32 0x03 - #define HID_RI_DATA_BITS(DataBits) HID_RI_DATA_BITS_ ## DataBits + #define HID_RI_DATA_BITS(DataBits) CONCAT_EXPANDED(HID_RI_DATA_BITS_, DataBits) #define _HID_RI_ENCODE_0(Data) #define _HID_RI_ENCODE_8(Data) , (Data & 0xFF) #define _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_8(Data) _HID_RI_ENCODE_8(Data >> 8) #define _HID_RI_ENCODE_32(Data) _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16) - #define _HID_RI_ENCODE(DataBits, ...) _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__) + #define _HID_RI_ENCODE(DataBits, ...) CONCAT_EXPANDED(_HID_RI_ENCODE_, DataBits(__VA_ARGS__)) #define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__)) #endif 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 |