Build: Fix incorrect build target for Ubuntu CI builds.

[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 20cc44f..6da9cf4 100644 (file)
--- a/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ b/LUFA/Drivers/USB/Core/StdDescriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2018.
+     Copyright (C) Dean Camera, 2019.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -97,7 +97,7 @@
                         *
                         *  \param[in] ...  Characters to initialize a USB String Descriptor structure with.
                         */
-                       #define USB_STRING_DESCRIPTOR_ARRAY(...)  { .Header = {.Size = sizeof(USB_Descriptor_Header_t) + sizeof((uint16_t){__VA_ARGS__}), .Type = DTYPE_String}, .UnicodeString = {__VA_ARGS__} }
+                       #define USB_STRING_DESCRIPTOR_ARRAY(...)  { .Header = {.Size = sizeof(USB_Descriptor_Header_t) + sizeof((uint16_t[]){__VA_ARGS__}), .Type = DTYPE_String}, .UnicodeString = {__VA_ARGS__} }
 
                        /** Macro to encode a given major/minor/revision version number into Binary Coded Decimal format for descriptor
                         *  fields requiring BCD encoding, such as the USB version number in the standard device descriptor.
@@ -120,7 +120,7 @@
                        #define LANGUAGE_ID_ENG                   0x0409
 
                        /** \name USB Configuration Descriptor Attribute Masks */
-                       //@{
+                       /**@{*/
                        /** Mask for the reserved bit in the Configuration Descriptor's \c ConfigAttributes field, which must be always
                         *  set on all USB devices for historical purposes.
                         */
@@ -145,10 +145,10 @@
                         *  see \ref USB_Device_RemoteWakeupEnabled().
                         */
                        #define USB_CONFIG_ATTR_REMOTEWAKEUP      0x20
-                       //@}
+                       /**@}*/
 
                        /** \name Endpoint Descriptor Attribute Masks */
-                       //@{
+                       /**@{*/
                        /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
                         *  \c Attributes value to indicate that the specified endpoint is not synchronized.
                         *
@@ -176,10 +176,10 @@
                         *  \see The USB specification for more details on the possible Endpoint attributes.
                         */
                        #define ENDPOINT_ATTR_SYNC                (3 << 2)
-                       //@}
+                       /**@}*/
 
                        /** \name Endpoint Descriptor Usage Masks */
-                       //@{
+                       /**@{*/
                        /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
                         *  \c Attributes value to indicate that the specified endpoint is used for data transfers.
                         *
@@ -200,7 +200,7 @@
                         *  \see The USB specification for more details on the possible Endpoint usage attributes.
                         */
                        #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK  (2 << 4)
-                       //@}
+                       /**@}*/
 
                /* Enums: */
                        /** Enum for the possible standard descriptor types, as given in each descriptor's header. */
@@ -215,8 +215,6 @@
                                DTYPE_Other                     = 0x07, /**< Indicates that the descriptor is of other type. */
                                DTYPE_InterfacePower            = 0x08, /**< Indicates that the descriptor is an interface power descriptor. */
                                DTYPE_InterfaceAssociation      = 0x0B, /**< Indicates that the descriptor is an interface association descriptor. */
-                               DTYPE_CSInterface               = 0x24, /**< Indicates that the descriptor is a class specific interface descriptor. */
-                               DTYPE_CSEndpoint                = 0x25, /**< Indicates that the descriptor is a class specific endpoint descriptor. */
                        };
 
                        /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors. */