Fixed GenericHIDHost demo report write routine incorrect for control type requests...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / HostChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
index 5367c98..c89910e 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -52,19 +52,17 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r

-       Pipe_ClearSetupSent();\r

 \r
        Pipe_Unfreeze();\r
 \r
        for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Host_Request_Header_t); HeaderByte++)\r
          Pipe_Write_Byte(*(HeaderStream++));\r
 \r
 \r
        Pipe_Unfreeze();\r
 \r
        for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Host_Request_Header_t); HeaderByte++)\r
          Pipe_Write_Byte(*(HeaderStream++));\r
 \r

-       Pipe_ClearSetupOUT();\r
+       Pipe_ClearControlSETUP();\r

        \r
        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_SetupSent)))\r
          goto End_Of_Control_Send;\r
 \r
        \r
        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_SetupSent)))\r
          goto End_Of_Control_Send;\r
 \r

-       Pipe_ClearSetupSent();\r

        Pipe_Freeze();\r
 \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
        Pipe_Freeze();\r
 \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r


@@ -93,7 +91,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                }\r
 \r
                                Pipe_Freeze();\r
                                }\r
 \r
                                Pipe_Freeze();\r

-                               Pipe_ClearSetupIN();\r
+                               Pipe_ClearControlIN();\r

                        }\r
                }\r
 \r
                        }\r
                }\r
 \r


@@ -103,7 +101,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r

-               Pipe_ClearSetupOUT();\r
+               Pipe_ClearControlOUT();\r

 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r


@@ -126,7 +124,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                        DataLen--;\r
                                }\r
                                \r
                                        DataLen--;\r
                                }\r
                                \r

-                               Pipe_ClearSetupOUT();\r
+                               Pipe_ClearControlOUT();\r

                        }\r
 \r
                        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                        }\r
 \r
                        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r


@@ -141,7 +139,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
                  goto End_Of_Control_Send;\r
 \r

-               Pipe_ClearSetupIN();\r
+               Pipe_ClearControlIN();\r

        }\r
 \r
 End_Of_Control_Send:\r
        }\r
 \r
 End_Of_Control_Send:\r


@@ -159,9 +157,9 @@ static uint8_t USB_Host_Wait_For_Setup_IOS(const uint8_t WaitType)
 {\r
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r
        \r
 {\r
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r
        \r

-       while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSetupSent())       ||\r
-                ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsSetupINReceived()) ||\r
-                ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsSetupOUTReady())))\r
+       while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())       ||\r
+                ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||\r
+                ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsOUTReady())))\r

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