Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / ConfigDescriptor.h

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
index c0ebe09..df5109d 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -78,7 +78,7 @@
                         *  // Can now access elements of the configuration header struct using the -> indirection operator\r
                         *  \endcode\r
                         */\r
                         *  // Can now access elements of the configuration header struct using the -> indirection operator\r
                         *  \endcode\r
                         */\r

-                       #define DESCRIPTOR_PCAST(DescriptorPtr, Type) ((Type*)DescriptorPtr)\r
+                       #define DESCRIPTOR_PCAST(DescriptorPtr, Type) ((Type*)(DescriptorPtr))\r

 \r
                        /** Casts a pointer to a descriptor inside the configuration descriptor into the given descriptor\r
                         *  type (as an actual struct instance rather than a pointer to a struct).\r
 \r
                        /** Casts a pointer to a descriptor inside the configuration descriptor into the given descriptor\r
                         *  type (as an actual struct instance rather than a pointer to a struct).\r


@@ -109,7 +109,7 @@
                         *\r
                         *  \see \ref USB_GetNextDescriptorComp function for more details\r
                         */\r
                         *\r
                         *  \see \ref USB_GetNextDescriptorComp function for more details\r
                         */\r

-                       typedef uint8_t (* const ConfigComparatorPtr_t)(void* const);\r
+                       typedef uint8_t (* const ConfigComparatorPtr_t)(void*);\r

 \r
                /* Function Prototypes: */\r
                        /** Searches for the next descriptor in the given configuration descriptor using a premade comparator\r
 \r
                /* Function Prototypes: */\r
                        /** Searches for the next descriptor in the given configuration descriptor using a premade comparator\r


@@ -152,10 +152,10 @@
                         *  }\r
                         *  \endcode\r
                         */\r
                         *  }\r
                         *  \endcode\r
                         */\r

-                       uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);\r
+                       uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);\r

                        \r
                /* Enums: */\r
                        \r
                /* Enums: */\r

-                       /** Enum for the possible return codes of the \ref USB_GetDeviceConfigDescriptor() function. */\r
+                       /** Enum for the possible return codes of the \ref USB_Host_GetDeviceConfigDescriptor() function. */\r

                        enum USB_Host_GetConfigDescriptor_ErrorCodes_t\r
                        {\r
                                HOST_GETCONFIG_Successful       = 0, /**< No error occurred while retrieving the configuration descriptor */\r
                        enum USB_Host_GetConfigDescriptor_ErrorCodes_t\r
                        {\r
                                HOST_GETCONFIG_Successful       = 0, /**< No error occurred while retrieving the configuration descriptor */\r


@@ -202,8 +202,8 @@
                         *\r
                         *  \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum\r
                         */\r
                         *\r
                         *  \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum\r
                         */\r

-                       uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,\r
-                                                             uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3);\r
+                       uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,\r
+                                                                  uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2) ATTR_NON_NULL_PTR_ARG(3);\r

 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value.\r
                         *  The bytes remaining value is automatically decremented.\r
 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value.\r
                         *  The bytes remaining value is automatically decremented.\r


@@ -213,9 +213,9 @@
                         * \param[in] Type  Descriptor type value to search for\r
                         */\r
                        void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
                         * \param[in] Type  Descriptor type value to search for\r
                         */\r
                        void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r

-                                                        uint8_t** const CurrConfigLoc,\r
+                                                        void** const CurrConfigLoc,\r

                                                         const uint8_t Type)\r
                                                         const uint8_t Type)\r

-                                                        ATTR_NON_NULL_PTR_ARG(1, 2);\r
+                                                        ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r

 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,\r
                         *  which must come before a descriptor of the second given type value. If the BeforeType type\r
 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,\r
                         *  which must come before a descriptor of the second given type value. If the BeforeType type\r


@@ -228,10 +228,10 @@
                         * \param[in] BeforeType  Descriptor type value which must not be reached before the given Type descriptor\r
                         */\r
                        void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r
                         * \param[in] BeforeType  Descriptor type value which must not be reached before the given Type descriptor\r
                         */\r
                        void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r

-                                                              uint8_t** const CurrConfigLoc,\r
+                                                              void** const CurrConfigLoc,\r

                                                               const uint8_t Type,\r
                                                               const uint8_t BeforeType)\r
                                                               const uint8_t Type,\r
                                                               const uint8_t BeforeType)\r

-                                                              ATTR_NON_NULL_PTR_ARG(1, 2);\r
+                                                              ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r

 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,\r
                         *  which must come after a descriptor of the second given type value. The bytes remaining value is\r
 \r
                        /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,\r
                         *  which must come after a descriptor of the second given type value. The bytes remaining value is\r


@@ -243,10 +243,10 @@
                         * \param[in] AfterType  Descriptor type value which must be reached before the given Type descriptor\r
                         */\r
                        void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r
                         * \param[in] AfterType  Descriptor type value which must be reached before the given Type descriptor\r
                         */\r
                        void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r

-                                                             uint8_t** const CurrConfigLoc,\r
+                                                             void** const CurrConfigLoc,\r

                                                              const uint8_t Type,\r
                                                              const uint8_t AfterType)\r
                                                              const uint8_t Type,\r
                                                              const uint8_t AfterType)\r

-                                                             ATTR_NON_NULL_PTR_ARG(1, 2);\r
+                                                             ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r

 \r
                /* Inline Functions: */\r
                        /** Skips over the current sub-descriptor inside the configuration descriptor, so that the pointer then\r
 \r
                /* Inline Functions: */\r
                        /** Skips over the current sub-descriptor inside the configuration descriptor, so that the pointer then\r


@@ -256,10 +256,10 @@
                         * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor\r
                         */\r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                         * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor\r
                         */\r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r

-                                                                uint8_t** const CurrConfigLoc) \r
-                                                                ATTR_NON_NULL_PTR_ARG(1, 2);                                                                     \r
+                                                                void** const CurrConfigLoc) \r
+                                                                ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);                                                                       \r

                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r

-                                                                uint8_t** const CurrConfigLoc)\r
+                                                                void** const CurrConfigLoc)\r

                        {\r
                                uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;\r
 \r
                        {\r
                                uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;\r
 \r