X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/a7eca42996418a7fd87b3411deb368e41615f9a1..5b06886dab18711c33c884e8da81b66d0f3f1541:/LUFA/Drivers/USB/Core/StdDescriptors.h

diff --git a/LUFA/Drivers/USB/Core/StdDescriptors.h b/LUFA/Drivers/USB/Core/StdDescriptors.h
index 32777cc0f..864a1c482 100644
--- a/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ b/LUFA/Drivers/USB/Core/StdDescriptors.h
@@ -93,6 +93,9 @@
 			 *  Decimal format for descriptor fields requiring BCD encoding, such as the USB version number in the
 			 *  standard device descriptor.
 			 *
+			 *  \note This value is automatically converted into Little Endian, suitable for direct use inside device
+			 *        descriptors on all architectures without endianness conversion macros.
+			 *
 			 *  \param[in]  x  Version number to encode as a 16-bit little-endian number, as a floating point number.
 			 */
 			#define VERSION_BCD(x)                    CPU_TO_LE16((((VERSION_TENS(x) << 4) | VERSION_ONES(x)) << 8) | \
@@ -101,7 +104,7 @@
 			/** String language ID for the English language. Should be used in \ref USB_Descriptor_String_t descriptors
 			 *  to indicate that the English language is supported by the device in its string descriptors.
 			 */
-			#define LANGUAGE_ID_ENG                   CPU_TO_LE16(0x0409)
+			#define LANGUAGE_ID_ENG                   0x0409
 
 			/** \name Endpoint Address Direction Masks */
 			//@{
@@ -612,17 +615,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).