Merge in changes from upstream

5 files changed, 42 insertions, 42 deletions

diff --git a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
index f464eefc4..7e5f2f176 100644
--- a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
+++ b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
@@ -100,7 +100,7 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name ADC Reference Configuration Masks */
-			//@{
+			/**@{*/
 			/** Reference mask, for using the voltage present at the AVR's AREF pin for the ADC reference. */
 			#define ADC_REFERENCE_AREF              0
 
@@ -109,10 +109,10 @@
 
 			/** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */
 			#define ADC_REFERENCE_INT2560MV         ((1 << REFS1) | (1 << REFS0))
-			//@}
+			/**@}*/
 
 			/** \name ADC Result Adjustment Configuration Masks */
-			//@{
+			/**@{*/
 			/** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the
 			 *  \ref ADC_GetResult() macro contain the 8 most significant bits of the result.
 			 */
@@ -122,10 +122,10 @@
 			 *  \ref ADC_GetResult() macro contain the 8 least significant bits of the result.
 			 */
 			#define ADC_RIGHT_ADJUSTED              (0 << ADLAR)
-			//@}
+			/**@}*/
 
 			/** \name ADC Mode Configuration Masks */
-			//@{
+			/**@{*/
 			/** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC
 			 *  is capable of at the given input clock speed.
 			 */
@@ -135,10 +135,10 @@
 			 *  the ADC returns to idle.
 			 */
 			#define ADC_SINGLE_CONVERSION           (0 << ADATE)
-			//@}
+			/**@}*/
 
 			/** \name ADC Prescaler Configuration Masks */
-			//@{
+			/**@{*/
 			/** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */
 			#define ADC_PRESCALE_2                  (1 << ADPS0)
 
@@ -159,10 +159,10 @@
 
 			/** Sets the ADC input clock to prescale by a factor of 128 the AVR's system clock. */
 			#define ADC_PRESCALE_128                ((1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0))
-			//@}
+			/**@}*/
 
 			/** \name ADC MUX Masks */
-			//@{
+			/**@{*/
 			/** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
 			#define ADC_CHANNEL0                    (0x00 << MUX0)
 
@@ -251,7 +251,7 @@
 			 *  \param[in] Channel  Index of the ADC channel whose MUX mask is to be retrieved.
 			 */
 			#define ADC_GET_CHANNEL_MASK(Channel)   CONCAT_EXPANDED(ADC_CHANNEL, Channel)
-			//@}
+			/**@}*/
 
 		/* Inline Functions: */
 			/** Configures the given ADC channel, ready for ADC conversions. This function sets the
diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
index 005b26688..750db0dc4 100644
--- a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
+++ b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
@@ -99,7 +99,7 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name SPI Prescaler Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 2. */
 			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED
 
@@ -120,43 +120,43 @@
 
 			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 128. */
 			#define SPI_SPEED_FCPU_DIV_128         ((1 << SPR1) | (1 << SPR0))
-			//@}
+			/**@}*/
 
 			/** \name SPI SCK Polarity Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
 			#define SPI_SCK_LEAD_RISING            (0 << CPOL)
 
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
 			#define SPI_SCK_LEAD_FALLING           (1 << CPOL)
-			//@}
+			/**@}*/
 
 			/** \name SPI Sample Edge Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should sampled on the leading edge. */
 			#define SPI_SAMPLE_LEADING             (0 << CPHA)
 
 			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
 			#define SPI_SAMPLE_TRAILING            (1 << CPHA)
-			//@}
+			/**@}*/
 
 			/** \name SPI Data Ordering Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out MSB first. */
 			#define SPI_ORDER_MSB_FIRST            (0 << DORD)
 
 			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out LSB first. */
 			#define SPI_ORDER_LSB_FIRST            (1 << DORD)
-			//@}
+			/**@}*/
 
 			/** \name SPI Mode Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
 			#define SPI_MODE_SLAVE                 (0 << MSTR)
 
 			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
 			#define SPI_MODE_MASTER                (1 << MSTR)
-			//@}
+			/**@}*/
 
 		/* Inline Functions: */
 			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
diff --git a/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
index d5b4b189e..a6754a27a 100644
--- a/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
+++ b/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
@@ -105,31 +105,31 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name SPI SCK Polarity Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
 			#define USART_SPI_SCK_LEAD_RISING            (0 << UCPOL1)
 
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
 			#define USART_SPI_SCK_LEAD_FALLING           (1 << UCPOL1)
-			//@}
+			/**@}*/
 
 			/** \name SPI Sample Edge Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should sampled on the leading edge. */
 			#define USART_SPI_SAMPLE_LEADING             (0 << UCPHA1)
 
 			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should be sampled on the trailing edge. */
 			#define USART_SPI_SAMPLE_TRAILING            (1 << UCPHA1)
-			//@}
+			/**@}*/
 
 			/** \name SPI Data Ordering Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out MSB first. */
 			#define USART_SPI_ORDER_MSB_FIRST            (0 << UDORD1)
 
 			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out LSB first. */
 			#define USART_SPI_ORDER_LSB_FIRST            (1 << UDORD1)
-			//@}
+			/**@}*/
 
 		/* Inline Functions: */
 			/** Initialize the USART module in Master SPI mode.
diff --git a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
index fffc0d162..96e5f76ad 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
@@ -96,7 +96,7 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name SPI Prescaler Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 2. */
 			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED
 
@@ -117,43 +117,43 @@
 
 			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 128. */
 			#define SPI_SPEED_FCPU_DIV_128         (3 << SPI_PRESCALER_gp)
-			//@}
+			/**@}*/
 
 			/** \name SPI SCK Polarity Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
 			#define SPI_SCK_LEAD_RISING            0
 
 			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
 			#define SPI_SCK_LEAD_FALLING           SPI_MODE1_bm
-			//@}
+			/**@}*/
 
 			/** \name SPI Sample Edge Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should sampled on the leading edge. */
 			#define SPI_SAMPLE_LEADING             0
 
 			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
 			#define SPI_SAMPLE_TRAILING            SPI_MODE0_bm
-			//@}
+			/**@}*/
 
 			/** \name SPI Data Ordering Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out MSB first. */
 			#define SPI_ORDER_MSB_FIRST            0
 
 			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out LSB first. */
 			#define SPI_ORDER_LSB_FIRST            SPI_DORD_bm
-			//@}
+			/**@}*/
 
 			/** \name SPI Mode Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
 			#define SPI_MODE_SLAVE                 0
 
 			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
 			#define SPI_MODE_MASTER                SPI_MASTER_bm
-			//@}
+			/**@}*/
 
 		/* Inline Functions: */
 			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
diff --git a/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h
index 8d91baa20..dff500ec1 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h
@@ -97,28 +97,28 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name SPI SCK Polarity Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI clock polarity mask for \ref SerialSPI_Init(). Indicates that the SCK should lead on the rising edge. */
 			#define USART_SPI_SCK_LEAD_RISING      0
-			//@}
+			/**@}*/
 
 			/** \name SPI Sample Edge Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should sampled on the leading edge. */
 			#define USART_SPI_SAMPLE_LEADING       0
 
 			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should be sampled on the trailing edge. */
 			#define USART_SPI_SAMPLE_TRAILING      (1 << 1)
-			//@}
+			/**@}*/
 
 			/** \name SPI Data Ordering Configuration Masks */
-			//@{
+			/**@{*/
 			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out MSB first. */
 			#define USART_SPI_ORDER_MSB_FIRST      0
 
 			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out LSB first. */
 			#define USART_SPI_ORDER_LSB_FIRST      (1 << 2)
-			//@}
+			/**@}*/
 
 		/* Inline Functions: */
 			/** Initialize the USART module in Master SPI mode.