X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/071e02c6b6b4837fa9cf0b6d4c749994e02638d7..8b053d6ba5dddc5f00fb52873185a2350bef5ce8:/LUFA/Drivers/USB/HighLevel/StdDescriptors.h diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index 9764b45ad..2ff162286 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -80,7 +80,10 @@ */ #define NO_DESCRIPTOR 0 - #if (!defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))) || defined(__DOXYGEN__) + #if (!defined(NO_INTERNAL_SERIAL) && \ + (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__) || \ + defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) || \ + defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))) /** String descriptor index for the device's unique serial number string descriptor within the device. * This unique serial number is used by the host to associate resources to the device (such as drivers or COM port * number allocations) to a device regardless of the port it is plugged in to on the host. Some USB AVRs contain @@ -216,7 +219,7 @@ * 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 define with standard element names. */ typedef struct { @@ -231,7 +234,7 @@ * 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 define with non-standard LUFA specific element names. */ typedef struct { @@ -246,7 +249,7 @@ * 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 define with standard element names. */ typedef struct { @@ -295,7 +298,7 @@ * 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 define with non-standard LUFA specific element names. */ typedef struct { @@ -343,7 +346,7 @@ * 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 define with standard element names. */ typedef struct { @@ -372,7 +375,7 @@ * 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 define with non-standard LUFA specific element names. */ typedef struct { @@ -400,7 +403,7 @@ * 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 define with standard element names. */ typedef struct { @@ -428,7 +431,7 @@ * 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 define with non-standard LUFA specific element names. */ typedef struct { @@ -462,14 +465,14 @@ * 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 define with standard element names. */ 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 TotalInterfaces; /**< Total number of associated interfaces. */ uint8_t Class; /**< Interface class ID. */ uint8_t SubClass; /**< Interface subclass ID. */ @@ -492,7 +495,7 @@ * 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 + * element names. */ typedef struct { @@ -501,7 +504,7 @@ * given by the specific class. */ uint8_t bFirstInterface; /**< Index of the first associated interface. */ - uint8_t bInterfaceCount; /** Total number of associated interfaces. */ + 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. */ @@ -515,7 +518,7 @@ * 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 define with standard element names. */ typedef struct { @@ -544,7 +547,7 @@ * 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 + * element names. */ typedef struct { @@ -579,7 +582,7 @@ * * 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 define with standard element names. */ typedef struct { @@ -610,7 +613,7 @@ * 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 + * element names. */ typedef struct {