Altered the Mass Storage Host class driver so that SCSI data STALLs from the attached...

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

diff --git a/LUFA/Drivers/USB/Core/StdDescriptors.h b/LUFA/Drivers/USB/Core/StdDescriptors.h
index e3d9255..f5bacf8 100644 (file)
--- a/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ b/LUFA/Drivers/USB/Core/StdDescriptors.h
@@ -54,10 +54,6 @@
                #include "USBMode.h"
                #include "Events.h"
 
-               #if defined(USB_CAN_BE_DEVICE)
-                       #include "Device.h"
-               #endif
-
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {
@@ -106,21 +102,6 @@
                         */
                        #define LANGUAGE_ID_ENG                   0x0409
 
-                       /** \name Endpoint Address Direction Masks */
-                       //@{
-                       /** Can be masked with an endpoint address for a \ref USB_Descriptor_Endpoint_t endpoint descriptor's
-                        *  EndpointAddress value to indicate to the host that the endpoint is of the IN direction (i.e, from
-                        *  device to host).
-                        */
-                       #define ENDPOINT_DESCRIPTOR_DIR_IN        0x80
-
-                       /** Can be masked with an endpoint address for a \ref USB_Descriptor_Endpoint_t endpoint descriptor's
-                        *  EndpointAddress value to indicate to the host that the endpoint is of the OUT direction (i.e, from
-                        *  host to device).
-                        */
-                       #define ENDPOINT_DESCRIPTOR_DIR_OUT       0x00
-                       //@}
-
                        /** \name USB Configuration Descriptor Attribute Masks */
                        //@{
                        /** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t
@@ -383,6 +364,53 @@
                                                              */
                        } ATTR_PACKED USB_StdDescriptor_Device_t;
 
+                       /** \brief Standard USB Device Qualifier Descriptor (LUFA naming conventions).
+                        *
+                        *  Type define for a standard Device Qualifier Descriptor. This structure uses LUFA-specific element names
+                        *  to make each element's purpose clearer.
+                        *
+                        *  \see \ref USB_StdDescriptor_DeviceQualifier_t for the version of this type with standard element names.
+                        */
+                       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. */
+
+                               uint8_t  Endpoint0Size; /**< Size of the control (address 0) endpoint's bank in bytes. */
+                               uint8_t  NumberOfConfigurations; /**< Total number of configurations supported by
+                                                                 *   the device.
+                                                                 */
+                               uint8_t  Reserved; /**< Reserved for future use, must be 0. */
+                       } ATTR_PACKED USB_Descriptor_DeviceQualifier_t;
+
+                       /** \brief Standard USB Device Qualifier Descriptor (USB-IF naming conventions).
+                        *
+                        *  Type define for a standard Device Qualifier Descriptor. This structure uses the relevant standard's given element names
+                        *  to ensure compatibility with the standard.
+                        *
+                        *  \see \ref USB_Descriptor_DeviceQualifier_t for the version of this type with non-standard LUFA specific element names.
+                        */
+                       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.
+                                                             */
+                               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. */
+                               uint8_t  bNumConfigurations; /**< Total number of configurations supported by
+                                                             *   the device.
+                                                             */
+                               uint8_t  bReserved; /**< Reserved for future use, must be 0. */
+                       } ATTR_PACKED USB_StdDescriptor_DeviceQualifier_t;
+
                        /** \brief Standard USB Configuration Descriptor (LUFA naming conventions).
                         *
                         *  Type define for a standard Configuration Descriptor header. This structure uses LUFA-specific element names
@@ -641,7 +669,7 @@
                        {
                                USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
 
-                               #if (ARCH == ARCH_AVR8)
+                               #if (((ARCH == ARCH_AVR8) || (ARCH == ARCH_XMEGA)) && !defined(__DOXYGEN__))
                                wchar_t  UnicodeString[];
                                #else
                                uint16_t UnicodeString[]; /**< String data, as unicode characters (alternatively,
@@ -653,7 +681,8 @@
                                                           *   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.
+                                                          *   array of ASCII characters on little endian devices with
+                                                          *   UTF-16-LE \c wchar_t encoding.
                                                           */
                                #endif
                        } ATTR_PACKED USB_Descriptor_String_t;