Partial commit: Rename USBFOO LED driver to fix capitalisation of file name, which...

[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 908f27b..7840bcb 100644 (file)
--- a/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ b/LUFA/Drivers/USB/Core/StdDescriptors.h
@@ -612,17 +612,21 @@
                        {
                                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.
-                                                         */
+                               #if (ARCH == ARCH_AVR8)
+                               wchar_t  UnicodeString[];
+                               #else
+                               uint16_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.
+                                                          */
+                               #endif
                        } ATTR_PACKED USB_Descriptor_String_t;
 
                        /** \brief Standard USB String Descriptor (USB-IF naming conventions).
@@ -645,15 +649,15 @@
                                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.
-                                                   */
+                               uint16_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.
+                                                    */
                        } ATTR_PACKED USB_StdDescriptor_String_t;
 
        /* Private Interface - For use in library only: */