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

LUFA/Common/Common.h

@@ -178,8 +178,8 @@
 			 *  \attention This macro should only be used with operands that do not have side effects from being evaluated
 			 *             multiple times.
 			 *
-			 *  \param[in] x  First value to compare
+			 *  \param[in] x  First value to compare.
-			 *  \param[in] y  First value to compare
+			 *  \param[in] y  First value to compare.
 			 *
 			 *  \return The smaller of the two input parameters
 			 */
@@ -207,6 +207,26 @@
 				#define STRINGIFY_EXPANDED(x)   STRINGIFY(x)
 			#endif
 
+			#if !defined(CONCAT) || defined(__DOXYGEN__)
+				/** Concatenates the given input into a single token, via the C Preprocessor.
+				 *
+				 *  \param[in] x  First item to concatenate.
+				 *  \param[in] y  Second item to concatenate.
+				 *
+				 *  \return Concatenated version of the input.
+				 */
+				#define CONCAT(x, y)            x ## y
+
+				/** CConcatenates the given input into a single token after macro expansion, via the C Preprocessor.
+				 *
+				 *  \param[in] x  First item to concatenate.
+				 *  \param[in] y  Second item to concatenate.
+				 *
+				 *  \return Concatenated version of the expanded input.
+				 */
+				#define CONCAT_EXPANDED(x, y)   CONCAT(x, y)
+			#endif
+
 			#if !defined(ISR) || defined(__DOXYGEN__)
 				/** Macro for the definition of interrupt service routines, so that the compiler can insert the required
 				 *  prologue and epilogue code to properly manage the interrupt routine without affecting the main thread's

LUFA/DoxygenPages/ChangeLog.txt

@@ -12,6 +12,7 @@
   *   - Added new Printer class bootloader
   *   - Added new Mass Storage class bootloader
   *   - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt)
+  *   - Added new CONCAT() and CONCAT_EXPANDED() convenience macros
   *
   *  <b>Changed:</b>
   *  - Core:

LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h

@@ -162,12 +162,9 @@
 			#define _BOARD_BUTTON_PORTLETTER        E
 		#endif
 
-		#define _BOARD_BUTTON_CONCAT2(Reg, Letter)  Reg ## Letter
+		#define _BOARD_BUTTON_PORT                  CONCAT_EXPANDED(PORT, _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_CONCAT(Reg, Letter)   _BOARD_BUTTON_CONCAT2(Reg, Letter)
+		#define _BOARD_BUTTON_PIN                   CONCAT_EXPANDED(PIN,  _BOARD_BUTTON_PORTLETTER)
-
+		#define _BOARD_BUTTON_DDR                   CONCAT_EXPANDED(DDR,  _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_PORT                 _BOARD_BUTTON_CONCAT(PORT, _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_PIN                  _BOARD_BUTTON_CONCAT(PIN,  _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_DDR                  _BOARD_BUTTON_CONCAT(DDR,  _BOARD_BUTTON_PORTLETTER)
 	#endif
 
 	/* Public Interface - May be used in end-application: */

LUFA/Drivers/Board/AVR8/MICROPENDOUS/LEDs.h

@@ -100,12 +100,9 @@
 			#define _BOARD_LED_PORTLETTER           B
 		#endif
 
-		#define _BOARD_LED_CONCAT2(Reg, Letter)     Reg ## Letter
+		#define _BOARD_LED_PORT                     CONCAT_EXPANDED(PORT, _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_CONCAT(Reg, Letter)      _BOARD_LED_CONCAT2(Reg, Letter)
+		#define _BOARD_LED_PIN                      CONCAT_EXPANDED(PIN,  _BOARD_LED_PORTLETTER)
-
+		#define _BOARD_LED_DDR                      CONCAT_EXPANDED(DDR,  _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_PORT                     _BOARD_LED_CONCAT(PORT, _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_PIN                      _BOARD_LED_CONCAT(PIN,  _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_DDR                      _BOARD_LED_CONCAT(DDR,  _BOARD_LED_PORTLETTER)
 	#endif
 
 	/* Public Interface - May be used in end-application: */

LUFA/Drivers/Board/Dataflash.h

@@ -131,18 +131,16 @@
 
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
-			#if !defined(__DOXYGEN__)
-				#define __GET_DATAFLASH_MASK2(x, y) x ## y
-				#define __GET_DATAFLASH_MASK(x)     __GET_DATAFLASH_MASK2(DATAFLASH_CHIP,x)
-			#endif
-
 			/** Retrieves the Dataflash chip select mask for the given Dataflash chip index.
 			 *
-			 *  \param[in] index  Index of the dataflash chip mask to retrieve
+			 *  \attention This macro will only work correctly on chip index numbers that are compile-time
+			 *             constants defined by the preprocessor.
+			 *
+			 *  \param[in] index  Index of the dataflash chip mask to retrieve.
 			 *
 			 *  \return Mask for the given Dataflash chip's /CS pin
 			 */
-			#define DATAFLASH_CHIP_MASK(index)      __GET_DATAFLASH_MASK(index)
+			#define DATAFLASH_CHIP_MASK(index)      CONCAT_EXPANDED(DATAFLASH_CHIP, index)
 
 		/* Inline Functions: */
 			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.

LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h

@@ -97,13 +97,6 @@
 			#error The ADC peripheral driver is not currently available for your selected microcontroller model.
 		#endif
 
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define _ADC_GET_MUX_MASK2(y)           ADC_CHANNEL ## y
-			#define _ADC_GET_MUX_MASK(y)            _ADC_GET_MUX_MASK2(y)
-	#endif
-
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name ADC Reference Configuration Masks */
@@ -257,7 +250,7 @@
 			 *
 			 *  \param[in] Channel  Index of the ADC channel whose MUX mask is to be retrieved.
 			 */
-			#define ADC_GET_CHANNEL_MASK(Channel)   _ADC_GET_MUX_MASK(Channel)
+			#define ADC_GET_CHANNEL_MASK(Channel)   CONCAT_EXPANDED(ADC_CHANNEL, Channel)
 			//@}
 
 		/* Inline Functions: */

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

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 USB_HostState            CONCAT_EXPANDED(GPIOR, HOST_STATE_AS_GPIOR)
-					#define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)
-					#define USB_HostState            _GET_HOST_GPIOR_NAME(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 USB_DeviceState            CONCAT_EXPANDED(GPIOR, DEVICE_STATE_AS_GPIOR)
-					#define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)
-					#define USB_DeviceState            _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)
 				#endif
 			#endif