Add new USB_Host_GetDeviceStringDescriptor() convenience function.

[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 c2dc503..84a6f0c 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
@@ -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


@@ -155,7 +155,7 @@
                        uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);\r
                        \r
                /* Enums: */\r
                        uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);\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


@@ -215,7 +215,7 @@
                        void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
                                                         void** const CurrConfigLoc,\r
                                                         const uint8_t Type)\r
                        void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
                                                         void** const CurrConfigLoc,\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


@@ -231,7 +231,7 @@
                                                               void** const CurrConfigLoc,\r
                                                               const uint8_t Type,\r
                                                               const uint8_t BeforeType)\r
                                                               void** const CurrConfigLoc,\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


@@ -246,7 +246,7 @@
                                                              void** const CurrConfigLoc,\r
                                                              const uint8_t Type,\r
                                                              const uint8_t AfterType)\r
                                                              void** const CurrConfigLoc,\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


@@ -257,14 +257,14 @@
                         */\r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                                                                 void** const CurrConfigLoc) \r
                         */\r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                                                                 void** const CurrConfigLoc) \r

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

                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                                                                 void** const CurrConfigLoc)\r
                        {\r
                                uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;\r
 \r
                        static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,\r
                                                                 void** const CurrConfigLoc)\r
                        {\r
                                uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;\r
 \r

-                               *((uint8_t**)CurrConfigLoc) += CurrDescriptorSize;\r
-                               *BytesRem                   -= CurrDescriptorSize;\r
+                               *CurrConfigLoc += CurrDescriptorSize;\r
+                               *BytesRem      -= CurrDescriptorSize;\r

                        }\r
                        \r
        /* Disable C linkage for C++ Compilers: */\r
                        }\r
                        \r
        /* Disable C linkage for C++ Compilers: */\r