Changed PIPE_CONTROLPIPE_DEFAULT_SIZE from 8 to 64 to try to prevent problems with...

[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 caa0fb0..2de5058 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -76,12 +76,12 @@
                        #define NO_DESCRIPTOR                     0\r
                        \r
                        /** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */\r
                        #define NO_DESCRIPTOR                     0\r
                        \r
                        /** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */\r

-                       #define USB_CONFIG_POWER_MA(x)            (x >> 1)\r
+                       #define USB_CONFIG_POWER_MA(mA)            (mA >> 1)\r

 \r
                        /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.\r
                         *  Should be used in string descriptor's headers for giving the string descriptor's byte length.\r
                         */\r
 \r
                        /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.\r
                         *  Should be used in string descriptor's headers for giving the string descriptor's byte length.\r
                         */\r

-                       #define USB_STRING_LEN(x)                 (sizeof(USB_Descriptor_Header_t) + (x << 1))\r
+                       #define USB_STRING_LEN(str)               (sizeof(USB_Descriptor_Header_t) + (str << 1))\r

                        \r
                        /** Macro to encode a given four digit floating point version number (e.g. 01.23) into Binary Coded\r
                         *  Decimal format for descriptor fields requiring BCD encoding, such as the USB version number in the\r
                        \r
                        /** Macro to encode a given four digit floating point version number (e.g. 01.23) into Binary Coded\r
                         *  Decimal format for descriptor fields requiring BCD encoding, such as the USB version number in the\r


@@ -183,7 +183,7 @@
                                /** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor()\r
                                 *  routine is not hooked in the user application to properly return descriptors to the library.\r
                                 *\r
                                /** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor()\r
                                 *  routine is not hooked in the user application to properly return descriptors to the library.\r
                                 *\r

-                                *  \see Events.h for more information on this event.\r
+                                *  \see \ref Group_Events for more information on this event.\r

                                 */\r
                                RAISES_EVENT(USB_DeviceError);\r
                        #endif\r
                                 */\r
                                RAISES_EVENT(USB_DeviceError);\r
                        #endif\r


@@ -206,10 +206,9 @@
                /* Type Defines: */\r
                        /** Type define for all descriptor's header, indicating the descriptor's length and type.\r
                         *\r
                /* Type Defines: */\r
                        /** Type define for all descriptor's header, indicating the descriptor's length and type.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -226,10 +225,9 @@
                        \r
                        /** Type define for a standard device descriptor.\r
                         *\r
                        \r
                        /** Type define for a standard device descriptor.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -286,10 +284,9 @@
 \r
                        /** Type define for a standard configuration descriptor.\r
                         *\r
 \r
                        /** Type define for a standard configuration descriptor.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -326,10 +323,9 @@
 \r
                        /** Type define for a standard interface descriptor.\r
                         *\r
 \r
                        /** Type define for a standard interface descriptor.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -372,10 +368,9 @@
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single\r
                         *  function. Read the ECN for more information.\r
                         *\r
                         *  together at the point of enumeration, loading one generic driver for all the interfaces in the single\r
                         *  function. Read the ECN for more information.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -406,10 +401,9 @@
 \r
                        /** Type define for a standard endpoint descriptor.\r
                         *\r
 \r
                        /** Type define for a standard endpoint descriptor.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                        */\r
                        typedef struct\r
                        {\r
                        */\r
                        typedef struct\r
                        {\r


@@ -448,10 +442,9 @@
                         *  This structure should also be used for string index 0, which contains the supported language IDs for\r
                         *  the device as an array.\r
                         *\r
                         *  This structure should also be used for string index 0, which contains the supported language IDs for\r
                         *  the device as an array.\r
                         *\r

-                        *  \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
-                        *        documentation for more information on the two descriptor naming schemes. If the\r
-                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
-                        *        identical to those listed in the USB standard.\r
+                        *  \note The non-standard structure element names are documented here. If the\r
+                        *        USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+                        *        with names identical to those listed in the USB standard.\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r