Fix accidentally changed code breaking the HID descriptor parser.

[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 4b96c69..42e3262 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -46,7 +46,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
        USB_Host_ResumeBus();\r
        \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
        USB_Host_ResumeBus();\r
        \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r

-         return ReturnStatus;\r
+         goto End_Of_Control_Send;\r

 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r


@@ -58,7 +58,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
        Pipe_ClearSETUP();\r
        \r
 \r
        Pipe_ClearSETUP();\r
        \r

-       if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_SetupSent)))\r
+       if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)\r

          goto End_Of_Control_Send;\r
 \r
        Pipe_Freeze();\r
          goto End_Of_Control_Send;\r
 \r
        Pipe_Freeze();\r


@@ -76,7 +76,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                        {\r
                                Pipe_Unfreeze();\r
 \r
                        {\r
                                Pipe_Unfreeze();\r
 \r

-                               if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
+                               if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)\r

                                  goto End_Of_Control_Send;\r
                                                        \r
                                if (!(Pipe_BytesInPipe()))\r
                                  goto End_Of_Control_Send;\r
                                                        \r
                                if (!(Pipe_BytesInPipe()))\r


@@ -96,12 +96,12 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                Pipe_SetToken(PIPE_TOKEN_OUT);\r
                Pipe_Unfreeze();\r
                \r
                Pipe_SetToken(PIPE_TOKEN_OUT);\r
                Pipe_Unfreeze();\r
                \r

-               if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
+               if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)\r

                  goto End_Of_Control_Send;\r
 \r
                Pipe_ClearOUT();\r
 \r
                  goto End_Of_Control_Send;\r
 \r
                Pipe_ClearOUT();\r
 \r

-               if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
+               if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)\r

                  goto End_Of_Control_Send;\r
        }\r
        else\r
                  goto End_Of_Control_Send;\r
        }\r
        else\r


@@ -113,7 +113,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
                        while (DataLen)\r
                        {\r
 \r
                        while (DataLen)\r
                        {\r

-                               if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
+                               if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)\r

                                  goto End_Of_Control_Send;\r
 \r
                                while (DataLen && (Pipe_BytesInPipe() < USB_ControlPipeSize))\r
                                  goto End_Of_Control_Send;\r
 \r
                                while (DataLen && (Pipe_BytesInPipe() < USB_ControlPipeSize))\r


@@ -125,7 +125,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                Pipe_ClearOUT();\r
                        }\r
 \r
                                Pipe_ClearOUT();\r
                        }\r
 \r

-                       if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
+                       if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)\r

                          goto End_Of_Control_Send;\r
 \r
                        Pipe_Freeze();\r
                          goto End_Of_Control_Send;\r
 \r
                        Pipe_Freeze();\r


@@ -134,7 +134,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                Pipe_SetToken(PIPE_TOKEN_IN);\r
                Pipe_Unfreeze();\r
 \r
                Pipe_SetToken(PIPE_TOKEN_IN);\r
                Pipe_Unfreeze();\r
 \r

-               if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
+               if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)\r

                  goto End_Of_Control_Send;\r
 \r
                Pipe_ClearIN();\r
                  goto End_Of_Control_Send;\r
 \r
                Pipe_ClearIN();\r


@@ -151,9 +151,13 @@ End_Of_Control_Send:
        return ReturnStatus;\r
 }\r
 \r
        return ReturnStatus;\r
 }\r
 \r

-static uint8_t USB_Host_Wait_For_Setup_IOS(const uint8_t WaitType)\r
+static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)\r

 {\r
 {\r

+       #if (USB_HOST_TIMEOUT_MS < 0xFF)\r
+       uint8_t  TimeoutCounter = USB_HOST_TIMEOUT_MS;  \r
+       #else\r

        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r

+       #endif\r

        \r
        while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||\r
                 ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||\r
        \r
        while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||\r
                 ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||\r