Endpoint configuration is now refined to give better output when all configurations...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / ConfigDescriptor.c

diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.c b/LUFA/Drivers/USB/Class/ConfigDescriptor.c
index d791069..7883830 100644 (file)
--- a/LUFA/Drivers/USB/Class/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.c
@@ -30,19 +30,22 @@
 \r
 #include "ConfigDescriptor.h"\r
 \r
 \r
 #include "ConfigDescriptor.h"\r
 \r

-uint8_t USB_Host_GetDeviceConfigDescriptor(uint16_t* const ConfigSizePtr, void* BufferPtr)\r
+#if defined(USB_CAN_BE_HOST)\r
+uint8_t USB_GetDeviceConfigDescriptor(uint16_t* const ConfigSizePtr, void* BufferPtr)\r

 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r

-       USB_HostRequest = (USB_Host_Request_Header_t)\r
+       USB_ControlRequest = (USB_Request_Header_t)\r

                {\r
                {\r

-                       bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                       bRequest:      REQ_GetDescriptor,\r
-                       wValue:        (DTYPE_Configuration << 8),\r
-                       wIndex:        0,\r
-                       wLength:       sizeof(USB_Descriptor_Configuration_Header_t),\r
+                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                       .bRequest      = REQ_GetDescriptor,\r
+                       .wValue        = (DTYPE_Configuration << 8),\r
+                       .wIndex        = 0,\r
+                       .wLength       = sizeof(USB_Descriptor_Configuration_Header_t),\r

                };\r
        \r
                };\r
        \r

+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        if (BufferPtr == NULL)\r
        {\r
                uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];\r
        if (BufferPtr == NULL)\r
        {\r
                uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];\r


@@ -57,35 +60,36 @@ uint8_t USB_Host_GetDeviceConfigDescriptor(uint16_t* const ConfigSizePtr, void*
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               USB_HostRequest.wLength = *ConfigSizePtr;\r
+               USB_ControlRequest.wLength = *ConfigSizePtr;\r

                \r
                ErrorCode      = USB_Host_SendControlRequest(BufferPtr);                                \r
        }\r
 \r
        return ErrorCode;\r
 }\r
                \r
                ErrorCode      = USB_Host_SendControlRequest(BufferPtr);                                \r
        }\r
 \r
        return ErrorCode;\r
 }\r

+#endif\r

 \r
 \r

-void USB_Host_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
-                                      uint8_t** const CurrConfigLoc,\r
-                                      const uint8_t Type)\r
+void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
+                                 uint8_t** const CurrConfigLoc,\r
+                                 const uint8_t Type)\r

 {\r
        while (*BytesRem)\r
        {\r
 {\r
        while (*BytesRem)\r
        {\r

-               USB_Host_GetNextDescriptor(BytesRem, CurrConfigLoc);      \r
+               USB_GetNextDescriptor(BytesRem, CurrConfigLoc);   \r

 \r
                if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)\r
                  return;\r
        }\r
 }\r
 \r
 \r
                if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)\r
                  return;\r
        }\r
 }\r
 \r

-void USB_Host_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r
-                                            uint8_t** const CurrConfigLoc,\r
-                                            const uint8_t Type,\r
-                                            const uint8_t BeforeType)\r
+void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r
+                                       uint8_t** const CurrConfigLoc,\r
+                                       const uint8_t Type,\r
+                                       const uint8_t BeforeType)\r

 {\r
        while (*BytesRem)\r
        {\r
 {\r
        while (*BytesRem)\r
        {\r

-               USB_Host_GetNextDescriptor(BytesRem, CurrConfigLoc);\r
+               USB_GetNextDescriptor(BytesRem, CurrConfigLoc);\r

 \r
                if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)\r
                {\r
 \r
                if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)\r
                {\r


@@ -99,19 +103,18 @@ void USB_Host_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-void USB_Host_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r
-                                           uint8_t** const CurrConfigLoc,\r
-                                           const uint8_t Type,\r
-                                           const uint8_t AfterType)\r
+void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r
+                                      uint8_t** const CurrConfigLoc,\r
+                                      const uint8_t Type,\r
+                                      const uint8_t AfterType)\r

 {\r
 {\r

-       USB_Host_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, AfterType);\r
+       USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, AfterType);\r

        \r
        if (*BytesRem)\r
        \r
        if (*BytesRem)\r

-         USB_Host_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type);\r
+         USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type);\r

 }\r
                        \r
 }\r
                        \r

-uint8_t USB_Host_GetNextDescriptorComp_P(uint16_t* BytesRem, uint8_t** CurrConfigLoc,\r
-                                         uint8_t (* const ComparatorRoutine)(void*))\r
+uint8_t USB_GetNextDescriptorComp_Prv(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ComparatorPtr_t ComparatorRoutine)\r

 {\r
        uint8_t ErrorCode;\r
                \r
 {\r
        uint8_t ErrorCode;\r
                \r


@@ -120,11 +123,11 @@ uint8_t USB_Host_GetNextDescriptorComp_P(uint16_t* BytesRem, uint8_t** CurrConfi
                uint8_t*  PrevDescLoc = *CurrConfigLoc;\r
                uint16_t  PrevBytesRem = *BytesRem;\r
 \r
                uint8_t*  PrevDescLoc = *CurrConfigLoc;\r
                uint16_t  PrevBytesRem = *BytesRem;\r
 \r

-               USB_Host_GetNextDescriptor(BytesRem, CurrConfigLoc);\r
+               USB_GetNextDescriptor(BytesRem, CurrConfigLoc);\r

 \r
 \r

-               if ((ErrorCode = ComparatorRoutine(*CurrConfigLoc)) != Descriptor_Search_NotFound)\r
+               if ((ErrorCode = ComparatorRoutine(*CurrConfigLoc)) != DESCRIPTOR_SEARCH_NotFound)\r

                {\r
                {\r

-                       if (ErrorCode == Descriptor_Search_Fail)\r
+                       if (ErrorCode == DESCRIPTOR_SEARCH_Fail)\r

                        {\r
                                *CurrConfigLoc = PrevDescLoc;\r
                                *BytesRem      = PrevBytesRem;\r
                        {\r
                                *CurrConfigLoc = PrevDescLoc;\r
                                *BytesRem      = PrevBytesRem;\r


@@ -134,5 +137,5 @@ uint8_t USB_Host_GetNextDescriptorComp_P(uint16_t* BytesRem, uint8_t** CurrConfi
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return Descriptor_Search_Comp_EndOfDescriptor;\r
+       return DESCRIPTOR_SEARCH_COMP_EndOfDescriptor;\r

 }\r
 }\r