Add stub RFCOMM command handlers. Move out RFCOMM frame length and data pointer calcu...

[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 9764b45..0b849bf 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -80,7 +80,10 @@
                         */
                        #define NO_DESCRIPTOR                     0
 
                         */
                        #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
                                /** 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


@@ -469,7 +472,7 @@
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
                                
                                uint8_t     FirstInterfaceIndex; /**< Index of the first associated interface. */
                                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. */
 
                                uint8_t     Class; /**< Interface class ID. */
                                uint8_t     SubClass; /**< Interface subclass ID. */


@@ -501,7 +504,7 @@
                                                              *   given by the specific class.
                                                              */
                                uint8_t     bFirstInterface; /**< Index of the first associated interface. */
                                                              *   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. */
                                uint8_t     bFunctionClass; /**< Interface class ID. */
                                uint8_t     bFunctionSubClass; /**< Interface subclass ID. */
                                uint8_t     bFunctionProtocol; /**< Interface protocol ID. */