Minor documentation enhancements.

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / StdDescriptors.h

diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index 0b849bf..00b60c3 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -52,6 +52,7 @@
        /* Includes: */
                #include <avr/pgmspace.h>
                #include <stdbool.h>
        /* Includes: */
                #include <avr/pgmspace.h>
                #include <stdbool.h>

+               #include <stdint.h>

                #include <stddef.h>
 
                #include "../../../Common/Common.h"
                #include <stddef.h>
 
                #include "../../../Common/Common.h"


@@ -98,7 +99,7 @@
                                #define USE_INTERNAL_SERIAL           NO_DESCRIPTOR
                        #endif
                        
                                #define USE_INTERNAL_SERIAL           NO_DESCRIPTOR
                        #endif
                        

-                       /** Macro to calculate the power value for the configuration descriptor, from a given number of milliamps. */
+                       /** Macro to calculate the power value for the configuration descriptor, from a given number of milliamperes. */

                        #define USB_CONFIG_POWER_MA(mA)           ((mA) >> 1)
 
                        /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.
                        #define USB_CONFIG_POWER_MA(mA)           ((mA) >> 1)
 
                        /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.


@@ -197,7 +198,7 @@
                         *  \see The USB specification for more details on the possible Endpoint usage attributes.
                         */
                        #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK  (2 << 4)
                         *  \see The USB specification for more details on the possible Endpoint usage attributes.
                         */
                        #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK  (2 << 4)

-
+                       

                /* Enums: */
                        /** Enum for the possible standard descriptor types, as given in each descriptor's header. */
                        enum USB_DescriptorTypes_t
                /* Enums: */
                        /** Enum for the possible standard descriptor types, as given in each descriptor's header. */
                        enum USB_DescriptorTypes_t


@@ -211,6 +212,8 @@
                                DTYPE_Other                = 0x07, /**< Indicates that the descriptor is of other type. */
                                DTYPE_InterfacePower       = 0x08, /**< Indicates that the descriptor is an interface power descriptor. */
                                DTYPE_InterfaceAssociation = 0x0B, /**< Indicates that the descriptor is an interface association descriptor. */
                                DTYPE_Other                = 0x07, /**< Indicates that the descriptor is of other type. */
                                DTYPE_InterfacePower       = 0x08, /**< Indicates that the descriptor is an interface power descriptor. */
                                DTYPE_InterfaceAssociation = 0x0B, /**< Indicates that the descriptor is an interface association descriptor. */

+                               DTYPE_CSInterface          = 0x24, /**< Indicates that the descriptor is a class specific interface descriptor. */
+                               DTYPE_CSEndpoint           = 0x25, /**< Indicates that the descriptor is a class specific endpoint descriptor. */

                        };
 
                /* Type Defines: */
                        };
 
                /* Type Defines: */


@@ -219,14 +222,14 @@
              *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
                         *  uses LUFA-specific element names to make each element's purpose clearer.
                         *
              *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
                         *  uses LUFA-specific element names to make each element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_Header_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Header_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     Size; /**< Size of the descriptor, in bytes. */
-                               uint8_t     Type; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-                                                  *   given by the specific class.
-                                                  */
+                               uint8_t Size; /**< Size of the descriptor, in bytes. */
+                               uint8_t Type; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                                              *   given by the specific class.
+                                              */

                        } USB_Descriptor_Header_t;
                        
                        /** \brief Standard USB Descriptor Header (USB-IF naming conventions).
                        } USB_Descriptor_Header_t;
                        
                        /** \brief Standard USB Descriptor Header (USB-IF naming conventions).


@@ -234,14 +237,14 @@
                         *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
                         *  uses the relevant standard's given element names to ensure compatibility with the standard.
                         *
                         *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
                         *  uses the relevant standard's given element names to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_Header_t for the version of this define with non-standard LUFA specific element names
+                        *  \see \ref USB_Descriptor_Header_t for the version of this type with non-standard LUFA specific element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-                                                             *   given by the specific class.
-                                                             */
+                               uint8_t bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                                                         *   given by the specific class.
+                                                         */

                        } USB_StdDescriptor_Header_t;
                        
                        /** \brief Standard USB Device Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Header_t;
                        
                        /** \brief Standard USB Device Descriptor (LUFA naming conventions).


@@ -249,48 +252,48 @@
                         *  Type define for a standard Device Descriptor. This structure uses LUFA-specific element names to make each
                         *  element's purpose clearer.
                         *
                         *  Type define for a standard Device Descriptor. This structure uses LUFA-specific element names to make each
                         *  element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_Device_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Device_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 

-                               uint16_t    USBSpecification; /**< BCD of the supported USB specification. */
-                               uint8_t     Class; /**< USB device class. */
-                               uint8_t     SubClass; /**< USB device subclass. */
-                               uint8_t     Protocol; /**< USB device protocol. */
+                               uint16_t USBSpecification; /**< BCD of the supported USB specification. */
+                               uint8_t  Class; /**< USB device class. */
+                               uint8_t  SubClass; /**< USB device subclass. */
+                               uint8_t  Protocol; /**< USB device protocol. */

                                
                                

-                               uint8_t     Endpoint0Size; /**< Size of the control (address 0) endpoint's bank in bytes. */
+                               uint8_t  Endpoint0Size; /**< Size of the control (address 0) endpoint's bank in bytes. */

                                
                                

-                               uint16_t    VendorID; /**< Vendor ID for the USB product. */
-                               uint16_t    ProductID; /**< Unique product ID for the USB product. */
-                               uint16_t    ReleaseNumber; /**< Product release (version) number. */
+                               uint16_t VendorID; /**< Vendor ID for the USB product. */
+                               uint16_t ProductID; /**< Unique product ID for the USB product. */
+                               uint16_t ReleaseNumber; /**< Product release (version) number. */

                                
                                

-                               uint8_t     ManufacturerStrIndex; /**< String index for the manufacturer's name. The
-                                                                  *   host will request this string via a separate
-                                                                  *   control request for the string descriptor.
-                                                                  *
-                                                                  *   \note If no string supplied, use \ref NO_DESCRIPTOR.
-                                                                  */
-                               uint8_t     ProductStrIndex; /**< String index for the product name/details.
-                                                             *
-                                                             *  \see ManufacturerStrIndex structure entry.
-                                                             */
-                               uint8_t     SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal
-                                                               *   serial number, in uppercase Unicode ASCII.
-                                                               *
-                                                               *  \note On some AVR models, there is an embedded serial number
-                                                               *        in the chip which can be used for the device serial number.
-                                                               *        To use this serial number, set this to USE_INTERNAL_SERIAL.
-                                                               *        On unsupported devices, this will evaluate to 0 and will cause
-                                                               *        the host to generate a pseudo-unique value for the device upon
-                                                               *        insertion.
+                               uint8_t  ManufacturerStrIndex; /**< String index for the manufacturer's name. The
+                                                               *   host will request this string via a separate
+                                                               *   control request for the string descriptor.

                                                                *
                                                                *

-                                                               *  \see ManufacturerStrIndex structure entry.
+                                                               *   \note If no string supplied, use \ref NO_DESCRIPTOR.

                                                                */
                                                                */

-                               uint8_t     NumberOfConfigurations; /**< Total number of configurations supported by
-                                                                    *   the device.
-                                                                    */
+                               uint8_t  ProductStrIndex; /**< String index for the product name/details.
+                                                          *
+                                                          *  \see ManufacturerStrIndex structure entry.
+                                                          */
+                               uint8_t  SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal
+                                                            *   serial number, in uppercase Unicode ASCII.
+                                                            *
+                                                            *  \note On some AVR models, there is an embedded serial number
+                                                            *        in the chip which can be used for the device serial number.
+                                                            *        To use this serial number, set this to USE_INTERNAL_SERIAL.
+                                                            *        On unsupported devices, this will evaluate to 0 and will cause
+                                                            *        the host to generate a pseudo-unique value for the device upon
+                                                            *        insertion.
+                                                            *
+                                                            *  \see ManufacturerStrIndex structure entry.
+                                                            */
+                               uint8_t  NumberOfConfigurations; /**< Total number of configurations supported by
+                                                                 *   the device.
+                                                                 */

                        } USB_Descriptor_Device_t;
 
                        /** \brief Standard USB Device Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_Device_t;
 
                        /** \brief Standard USB Device Descriptor (USB-IF naming conventions).


@@ -298,47 +301,47 @@
                         *  Type define for a standard Device Descriptor. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *
                         *  Type define for a standard Device Descriptor. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_Device_t for the version of this define with non-standard LUFA specific element names
+                        *  \see \ref USB_Descriptor_Device_t for the version of this type with non-standard LUFA specific element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                               uint8_t  bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value

                                                              *   given by the specific class.
                                                              */
                                                              *   given by the specific class.
                                                              */

-                               uint16_t    bcdUSB; /**< BCD of the supported USB specification. */
-                               uint8_t     bDeviceClass; /**< USB device class. */
-                               uint8_t     bDeviceSubClass; /**< USB device subclass. */
-                               uint8_t     bDeviceProtocol; /**< USB device protocol. */
-                               uint8_t     bMaxPacketSize0; /**< Size of the control (address 0) endpoint's bank in bytes. */
-                               uint16_t    idVendor; /**< Vendor ID for the USB product. */
-                               uint16_t    idProduct; /**< Unique product ID for the USB product. */
-                               uint16_t    bcdDevice; /**< Product release (version) number. */
-                               uint8_t     iManufacturer; /**< String index for the manufacturer's name. The
-                                                           *   host will request this string via a separate
-                                                           *   control request for the string descriptor.
-                                                           *
-                                                           *   \note If no string supplied, use \ref NO_DESCRIPTOR.
-                                                           */
-                               uint8_t     iProduct; /**< String index for the product name/details.
-                                                      *
-                                                      *  \see ManufacturerStrIndex structure entry.
-                                                      */
-                               uint8_t     iSerialNumber; /**< String index for the product's globally unique hexadecimal
-                                                           *   serial number, in uppercase Unicode ASCII.
-                                                           *
-                                                           *  \note On some AVR models, there is an embedded serial number
-                                                           *        in the chip which can be used for the device serial number.
-                                                           *        To use this serial number, set this to USE_INTERNAL_SERIAL.
-                                                           *        On unsupported devices, this will evaluate to 0 and will cause
-                                                           *        the host to generate a pseudo-unique value for the device upon
-                                                           *        insertion.
-                                                           *
-                                                           *  \see ManufacturerStrIndex structure entry.
-                                                            */
-                               uint8_t     bNumConfigurations; /**< Total number of configurations supported by
-                                                                *   the device.
-                                                                */
+                               uint16_t bcdUSB; /**< BCD of the supported USB specification. */
+                               uint8_t  bDeviceClass; /**< USB device class. */
+                               uint8_t  bDeviceSubClass; /**< USB device subclass. */
+                               uint8_t  bDeviceProtocol; /**< USB device protocol. */
+                               uint8_t  bMaxPacketSize0; /**< Size of the control (address 0) endpoint's bank in bytes. */
+                               uint16_t idVendor; /**< Vendor ID for the USB product. */
+                               uint16_t idProduct; /**< Unique product ID for the USB product. */
+                               uint16_t bcdDevice; /**< Product release (version) number. */
+                               uint8_t  iManufacturer; /**< String index for the manufacturer's name. The
+                                                        *   host will request this string via a separate
+                                                        *   control request for the string descriptor.
+                                                        *
+                                                        *   \note If no string supplied, use \ref NO_DESCRIPTOR.
+                                                        */
+                               uint8_t  iProduct; /**< String index for the product name/details.
+                                                   *
+                                                   *  \see ManufacturerStrIndex structure entry.
+                                                   */
+                               uint8_t iSerialNumber; /**< String index for the product's globally unique hexadecimal
+                                                       *   serial number, in uppercase Unicode ASCII.
+                                                       *
+                                                       *  \note On some AVR models, there is an embedded serial number
+                                                       *        in the chip which can be used for the device serial number.
+                                                       *        To use this serial number, set this to USE_INTERNAL_SERIAL.
+                                                       *        On unsupported devices, this will evaluate to 0 and will cause
+                                                       *        the host to generate a pseudo-unique value for the device upon
+                                                       *        insertion.
+                                                       *
+                                                       *  \see ManufacturerStrIndex structure entry.
+                                                       */
+                               uint8_t  bNumConfigurations; /**< Total number of configurations supported by
+                                                             *   the device.
+                                                             */

                        } USB_StdDescriptor_Device_t;
 
                        /** \brief Standard USB Configuration Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Device_t;
 
                        /** \brief Standard USB Configuration Descriptor (LUFA naming conventions).


@@ -346,28 +349,28 @@
                         *  Type define for a standard Configuration Descriptor header. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *
                         *  Type define for a standard Configuration Descriptor header. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_Configuration_Header_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Configuration_Header_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                        
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                        

-                               uint16_t    TotalConfigurationSize; /**< Size of the configuration descriptor header,
-                                                                    *   and all sub descriptors inside the configuration.
-                                                                    */
-                               uint8_t     TotalInterfaces; /**< Total number of interfaces in the configuration. */
+                               uint16_t TotalConfigurationSize; /**< Size of the configuration descriptor header,
+                                                                 *   and all sub descriptors inside the configuration.
+                                                                 */
+                               uint8_t  TotalInterfaces; /**< Total number of interfaces in the configuration. */

 
 

-                               uint8_t     ConfigurationNumber; /**< Configuration index of the current configuration. */
-                               uint8_t     ConfigurationStrIndex; /**< Index of a string descriptor describing the configuration. */
+                               uint8_t  ConfigurationNumber; /**< Configuration index of the current configuration. */
+                               uint8_t  ConfigurationStrIndex; /**< Index of a string descriptor describing the configuration. */

                                
                                

-                               uint8_t     ConfigAttributes; /**< Configuration attributes, comprised of a mask of zero or
-                                                              *   more USB_CONFIG_ATTR_* masks.
-                                                              */
+                               uint8_t  ConfigAttributes; /**< Configuration attributes, comprised of a mask of zero or
+                                                           *   more USB_CONFIG_ATTR_* masks.
+                                                           */

                                
                                

-                               uint8_t     MaxPowerConsumption; /**< Maximum power consumption of the device while in the
-                                                                 *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
-                                                                 *   macro.
-                                                                 */
+                               uint8_t  MaxPowerConsumption; /**< Maximum power consumption of the device while in the
+                                                              *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
+                                                              *   macro.
+                                                              */

                        } USB_Descriptor_Configuration_Header_t;
                        
                        /** \brief Standard USB Configuration Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_Configuration_Header_t;
                        
                        /** \brief Standard USB Configuration Descriptor (USB-IF naming conventions).


@@ -375,27 +378,27 @@
                         *  Type define for a standard Configuration Descriptor header. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *
                         *  Type define for a standard Configuration Descriptor header. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_Device_t for the version of this define with non-standard LUFA specific element names
+                        *  \see \ref USB_Descriptor_Device_t for the version of this type with non-standard LUFA specific element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                               uint8_t  bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value

                                                              *   given by the specific class.
                                                              */
                                                              *   given by the specific class.
                                                              */

-                               uint16_t    wTotalLength; /**< Size of the configuration descriptor header,
+                               uint16_t wTotalLength; /**< Size of the configuration descriptor header,

                                                           *   and all sub descriptors inside the configuration.
                                                           */
                                                           *   and all sub descriptors inside the configuration.
                                                           */

-                               uint8_t     bNumInterfaces; /**< Total number of interfaces in the configuration. */
-                               uint8_t     bConfigurationValue; /**< Configuration index of the current configuration. */
-                               uint8_t     iConfiguration; /**< Index of a string descriptor describing the configuration. */
-                               uint8_t     bmAttributes; /**< Configuration attributes, comprised of a mask of zero or
-                                                          *   more USB_CONFIG_ATTR_* masks.
-                                                          */
-                               uint8_t     bMaxPower; /**< Maximum power consumption of the device while in the
-                                                       *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
-                                                       *   macro.
+                               uint8_t  bNumInterfaces; /**< Total number of interfaces in the configuration. */
+                               uint8_t  bConfigurationValue; /**< Configuration index of the current configuration. */
+                               uint8_t  iConfiguration; /**< Index of a string descriptor describing the configuration. */
+                               uint8_t  bmAttributes; /**< Configuration attributes, comprised of a mask of zero or
+                                                       *   more USB_CONFIG_ATTR_* masks.

                                                        */
                                                        */

+                               uint8_t  bMaxPower; /**< Maximum power consumption of the device while in the
+                                                    *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
+                                                    *   macro.
+                                                    */

                        } USB_StdDescriptor_Configuration_Header_t;
 
                        /** \brief Standard USB Interface Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Configuration_Header_t;
 
                        /** \brief Standard USB Interface Descriptor (LUFA naming conventions).


@@ -403,27 +406,25 @@
                         *  Type define for a standard Interface Descriptor. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *
                         *  Type define for a standard Interface Descriptor. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_Interface_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Interface_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 

-                               uint8_t     InterfaceNumber; /**< Index of the interface in the current configuration. */
-                               uint8_t     AlternateSetting; /**< Alternate setting for the interface number. The same
-                                                              *   interface number can have multiple alternate settings
-                                                              *   with different endpoint configurations, which can be
-                                                              *   selected by the host.
-                                                              */
-                               uint8_t     TotalEndpoints; /**< Total number of endpoints in the interface. */
+                               uint8_t InterfaceNumber; /**< Index of the interface in the current configuration. */
+                               uint8_t AlternateSetting; /**< Alternate setting for the interface number. The same
+                                                          *   interface number can have multiple alternate settings
+                                                          *   with different endpoint configurations, which can be
+                                                          *   selected by the host.
+                                                          */
+                               uint8_t TotalEndpoints; /**< Total number of endpoints in the interface. */

                                
                                

-                               uint8_t     Class; /**< Interface class ID. */
-                               uint8_t     SubClass; /**< Interface subclass ID. */
-                               uint8_t     Protocol; /**< Interface protocol ID. */
+                               uint8_t Class; /**< Interface class ID. */
+                               uint8_t SubClass; /**< Interface subclass ID. */
+                               uint8_t Protocol; /**< Interface protocol ID. */

 
 

-                               uint8_t     InterfaceStrIndex; /**< Index of the string descriptor describing the
-                                                               *   interface.
-                                                               */
+                               uint8_t InterfaceStrIndex; /**< Index of the string descriptor describing the interface. */

                        } USB_Descriptor_Interface_t;
                        
                        /** \brief Standard USB Interface Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_Interface_t;
                        
                        /** \brief Standard USB Interface Descriptor (USB-IF naming conventions).


@@ -431,27 +432,27 @@
                         *  Type define for a standard Interface Descriptor. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *
                         *  Type define for a standard Interface Descriptor. This structure uses the relevant standard's given element names
                         *  to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_Interface_t for the version of this define with non-standard LUFA specific element names
+                        *  \see \ref USB_Descriptor_Interface_t for the version of this type with non-standard LUFA specific element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-                                                             *   given by the specific class.
-                                                             */
-                               uint8_t     bInterfaceNumber; /**< Index of the interface in the current configuration. */
-                               uint8_t     bAlternateSetting; /**< Alternate setting for the interface number. The same
-                                                               *   interface number can have multiple alternate settings
-                                                               *   with different endpoint configurations, which can be
-                                                               *   selected by the host.
-                                                               */
-                               uint8_t     bNumEndpoints; /**< Total number of endpoints in the interface. */
-                               uint8_t     bInterfaceClass; /**< Interface class ID. */
-                               uint8_t     bInterfaceSubClass; /**< Interface subclass ID. */
-                               uint8_t     bInterfaceProtocol; /**< Interface protocol ID. */
-                               uint8_t     iInterface; /**< Index of the string descriptor describing the
-                                                        *   interface.
-                                                        */
+                               uint8_t bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                                                         *   given by the specific class.
+                                                         */
+                               uint8_t bInterfaceNumber; /**< Index of the interface in the current configuration. */
+                               uint8_t bAlternateSetting; /**< Alternate setting for the interface number. The same
+                                                           *   interface number can have multiple alternate settings
+                                                           *   with different endpoint configurations, which can be
+                                                           *   selected by the host.
+                                                           */
+                               uint8_t bNumEndpoints; /**< Total number of endpoints in the interface. */
+                               uint8_t bInterfaceClass; /**< Interface class ID. */
+                               uint8_t bInterfaceSubClass; /**< Interface subclass ID. */
+                               uint8_t bInterfaceProtocol; /**< Interface protocol ID. */
+                               uint8_t iInterface; /**< Index of the string descriptor describing the
+                                                    *   interface.
+                                                    */

                        } USB_StdDescriptor_Interface_t;
 
                        /** \brief Standard USB Interface Association Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Interface_t;
 
                        /** \brief Standard USB Interface Association Descriptor (LUFA naming conventions).


@@ -460,27 +461,27 @@
                         *  to make each element's purpose clearer.
                         *
                         *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at
                         *  to make each element's purpose clearer.
                         *
                         *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at

-                        *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows compound
+                        *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows composite

                         *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
                         *  function. Read the ECN for more information.
                         *
                         *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
                         *  function. Read the ECN for more information.
                         *

-                        *  \see \ref USB_StdDescriptor_Interface_Association_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Interface_Association_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                                
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                                

-                               uint8_t     FirstInterfaceIndex; /**< Index of the first associated interface. */
-                               uint8_t     TotalInterfaces; /**< Total number of associated interfaces. */
+                               uint8_t FirstInterfaceIndex; /**< Index of the first associated interface. */
+                               uint8_t TotalInterfaces; /**< Total number of associated interfaces. */

 
 

-                               uint8_t     Class; /**< Interface class ID. */
-                               uint8_t     SubClass; /**< Interface subclass ID. */
-                               uint8_t     Protocol; /**< Interface protocol ID. */
+                               uint8_t Class; /**< Interface class ID. */
+                               uint8_t SubClass; /**< Interface subclass ID. */
+                               uint8_t Protocol; /**< Interface protocol ID. */

 
 

-                               uint8_t     IADStrIndex; /**< Index of the string descriptor describing the
-                                                         *   interface association.
-                                                         */
+                               uint8_t IADStrIndex; /**< Index of the string descriptor describing the
+                                                     *   interface association.
+                                                     */

                        } USB_Descriptor_Interface_Association_t;
                                
                        /** \brief Standard USB Interface Association Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_Interface_Association_t;
                                
                        /** \brief Standard USB Interface Association Descriptor (USB-IF naming conventions).


@@ -489,28 +490,28 @@
                         *  element names to ensure compatibility with the standard.
                         *
                         *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at
                         *  element names to ensure compatibility with the standard.
                         *
                         *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at

-                        *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows compound
+                        *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows composite

                         *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
                         *  function. Read the ECN for more information.
                         *
                         *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
                         *  function. Read the ECN for more information.
                         *

-                        *  \see \ref USB_Descriptor_Interface_Association_t for the version of this define with non-standard LUFA specific
-                        *       element names
+                        *  \see \ref USB_Descriptor_Interface_Association_t for the version of this type with non-standard LUFA specific
+                        *       element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-                                                             *   given by the specific class.
-                                                             */
-                               uint8_t     bFirstInterface; /**< Index of the first associated interface. */
-                               uint8_t     bInterfaceCount; /**< Total number of associated interfaces. */
-                               uint8_t     bFunctionClass; /**< Interface class ID. */
-                               uint8_t     bFunctionSubClass; /**< Interface subclass ID. */
-                               uint8_t     bFunctionProtocol; /**< Interface protocol ID. */
-                               uint8_t     iFunction; /**< Index of the string descriptor describing the
-                                                       *   interface association.
-                                                       */
+                               uint8_t bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
+                                                         *   given by the specific class.
+                                                         */
+                               uint8_t bFirstInterface; /**< Index of the first associated interface. */
+                               uint8_t bInterfaceCount; /**< Total number of associated interfaces. */
+                               uint8_t bFunctionClass; /**< Interface class ID. */
+                               uint8_t bFunctionSubClass; /**< Interface subclass ID. */
+                               uint8_t bFunctionProtocol; /**< Interface protocol ID. */
+                               uint8_t iFunction; /**< Index of the string descriptor describing the
+                                                   *   interface association.
+                                                   */

                        } USB_StdDescriptor_Interface_Association_t;
 
                        /** \brief Standard USB Endpoint Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Interface_Association_t;
 
                        /** \brief Standard USB Endpoint Descriptor (LUFA naming conventions).


@@ -518,27 +519,24 @@
                         *  Type define for a standard Endpoint Descriptor. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *
                         *  Type define for a standard Endpoint Descriptor. This structure uses LUFA-specific element names
                         *  to make each element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_Endpoint_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_Endpoint_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 

-                               uint8_t     EndpointAddress; /**< Logical address of the endpoint within the device
-                                                             *   for the current configuration, including direction
-                                                             *   mask.
-                                                             */
-                               uint8_t     Attributes; /**< Endpoint attributes, comprised of a mask of the
-                                                        *   endpoint type (EP_TYPE_*) and attributes (ENDPOINT_ATTR_*)
-                                                        *   masks.
-                                                        */
-                               uint16_t    EndpointSize; /**< Size of the endpoint bank, in bytes. This indicates the
-                                                          *   maximum packet size that the endpoint can receive at a time.
+                               uint8_t  EndpointAddress; /**< Logical address of the endpoint within the device for the current
+                                                          *   configuration, including direction mask.

                                                           */
                                                           */

-                               
-                               uint8_t     PollingIntervalMS; /**< Polling interval in milliseconds for the endpoint
-                                                               *   if it is an INTERRUPT or ISOCHRONOUS type.
-                                                               */
+                               uint8_t  Attributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (EP_TYPE_*)
+                                                     *   and attributes (ENDPOINT_ATTR_*) masks.
+                                                     */
+                               uint16_t EndpointSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet
+                                                       *   size that the endpoint can receive at a time.
+                                                       */
+                               uint8_t  PollingIntervalMS; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT
+                                                            *   or ISOCHRONOUS type.
+                                                            */

                        } USB_Descriptor_Endpoint_t;
                                
                        /** \brief Standard USB Endpoint Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_Endpoint_t;
                                
                        /** \brief Standard USB Endpoint Descriptor (USB-IF naming conventions).


@@ -546,29 +544,27 @@
                         *  Type define for a standard Endpoint Descriptor. This structure uses the relevant standard's given
                         *  element names to ensure compatibility with the standard.
                         *
                         *  Type define for a standard Endpoint Descriptor. This structure uses the relevant standard's given
                         *  element names to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_Endpoint_t for the version of this define with non-standard LUFA specific
-                        *       element names
+                        *  \see \ref USB_Descriptor_Endpoint_t for the version of this type with non-standard LUFA specific
+                        *       element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                               uint8_t     bLength; /**< Size of the descriptor, in bytes. */
-                               uint8_t     bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-                                                             *   given by the specific class.
-                                                             */
-                               uint8_t     bEndpointAddress; /**< Logical address of the endpoint within the device
-                                                              *   for the current configuration, including direction
-                                                              *   mask.
-                                                              */
-                               uint8_t     bmAttributes; /**< Endpoint attributes, comprised of a mask of the
-                                                          *   endpoint type (EP_TYPE_*) and attributes (ENDPOINT_ATTR_*)
-                                                          *   masks.
+                               uint8_t  bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a
+                                                          *   value given by the specific class.

                                                           */
                                                           */

-                               uint16_t    wMaxPacketSize; /**< Size of the endpoint bank, in bytes. This indicates the
-                                                            *   maximum packet size that the endpoint can receive at a time.
-                                                            */
-                               uint8_t     bInterval; /**< Polling interval in milliseconds for the endpoint
-                                                       *   if it is an INTERRUPT or ISOCHRONOUS type.
+                               uint8_t  bEndpointAddress; /**< Logical address of the endpoint within the device for the current 
+                                                           *   configuration, including direction mask.
+                                                           */
+                               uint8_t  bmAttributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (EP_TYPE_*) 
+                                                       *   and attributes (ENDPOINT_ATTR_*) masks.

                                                        */
                                                        */

+                               uint16_t wMaxPacketSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet size
+                                                         *   that the endpoint can receive at a time.
+                                                         */
+                               uint8_t  bInterval; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT or
+                                                    *   ISOCHRONOUS type.
+                                                    */

                        } USB_StdDescriptor_Endpoint_t;
 
                        /** \brief Standard USB String Descriptor (LUFA naming conventions).
                        } USB_StdDescriptor_Endpoint_t;
 
                        /** \brief Standard USB String Descriptor (LUFA naming conventions).


@@ -582,23 +578,23 @@
                         *
                         *  This structure uses LUFA-specific element names to make each element's purpose clearer.
                         *
                         *
                         *  This structure uses LUFA-specific element names to make each element's purpose clearer.
                         *

-                        *  \see \ref USB_StdDescriptor_String_t for the version of this define with standard element names
+                        *  \see \ref USB_StdDescriptor_String_t for the version of this type with standard element names.

                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                                
                         */
                        typedef struct
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                                

-                               wchar_t UnicodeString[];  /**< String data, as unicode characters (alternatively,
-                                                          *   string language IDs). If normal ASCII characters are
-                                                          *   to be used, they must be added as an array of characters
-                                                          *   rather than a normal C string so that they are widened to
-                                                          *   Unicode size.
-                                                          *
-                                                          *   Under GCC, strings prefixed with the "L" character (before
-                                                          *   the opening string quotation mark) are considered to be
-                                                          *   Unicode strings, and may be used instead of an explicit
-                                                          *   array of ASCII characters.
-                                                          */
+                               wchar_t UnicodeString[]; /**< String data, as unicode characters (alternatively,
+                                                         *   string language IDs). If normal ASCII characters are
+                                                         *   to be used, they must be added as an array of characters
+                                                         *   rather than a normal C string so that they are widened to
+                                                         *   Unicode size.
+                                                         *
+                                                         *   Under GCC, strings prefixed with the "L" character (before
+                                                         *   the opening string quotation mark) are considered to be
+                                                         *   Unicode strings, and may be used instead of an explicit
+                                                         *   array of ASCII characters.
+                                                         */

                        } USB_Descriptor_String_t;
 
                        /** \brief Standard USB String Descriptor (USB-IF naming conventions).
                        } USB_Descriptor_String_t;
 
                        /** \brief Standard USB String Descriptor (USB-IF naming conventions).


@@ -612,27 +608,24 @@
                         *
                         *  This structure uses the relevant standard's given element names to ensure compatibility with the standard.
                         *
                         *
                         *  This structure uses the relevant standard's given element names to ensure compatibility with the standard.
                         *

-                        *  \see \ref USB_Descriptor_String_t for the version of this define with with non-standard LUFA specific
-                        *       element names
+                        *  \see \ref USB_Descriptor_String_t for the version of this type with with non-standard LUFA specific
+                        *       element names.

                         */
                        typedef struct
                        {
                         */
                        typedef struct
                        {

-                                       uint8_t                 bLength; /**< Size of the descriptor, in bytes. */
-                                       uint8_t                 bDescriptorType; /**< Type of the descriptor, either a value in
-                                                                                 *   \ref USB_DescriptorTypes_t or a value
-                                                                             *   given by the specific class.
-                                                                             */
-                                       int16_t                 bString[]; /**< String data, as unicode characters (alternatively,
-                                                                       *   string language IDs). If normal ASCII characters are
-                                                                       *   to be used, they must be added as an array of characters
-                                                                       *   rather than a normal C string so that they are widened to
-                                                                       *   Unicode size.
-                                                                       *
-                                                                       *   Under GCC, strings prefixed with the "L" character (before
-                                                                       *   the opening string quotation mark) are considered to be
-                                                                       *   Unicode strings, and may be used instead of an explicit
-                                                                       *   array of ASCII characters.
-                                                                       */
+                               uint8_t bLength; /**< Size of the descriptor, in bytes. */
+                               uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t
+                                                         *   or a value given by the specific class.
+                                                         */
+                               int16_t bString[]; /**< String data, as unicode characters (alternatively, string language IDs).
+                                                   *   If normal ASCII characters are to be used, they must be added as an array
+                                                   *   of characters rather than a normal C string so that they are widened to
+                                                   *   Unicode size.
+                                                   *
+                                                   *   Under GCC, strings prefixed with the "L" character (before the opening string
+                                                   *   quotation mark) are considered to be Unicode strings, and may be used instead
+                                                   *   of an explicit array of ASCII characters.
+                                                   */

                        } USB_StdDescriptor_String_t;
 
        /* Private Interface - For use in library only: */
                        } USB_StdDescriptor_String_t;
 
        /* Private Interface - For use in library only: */