Dataflash_WaitWhileBusy() now always ensures that the dataflash is ready for the...

[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..2bdab7c 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
-         return ReturnStatus;\r
+         goto End_Of_Control_Send;\r
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r
@@ -153,7 +153,11 @@ End_Of_Control_Send:
 \r
 static uint8_t USB_Host_Wait_For_Setup_IOS(const uint8_t WaitType)\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
+       #endif\r
        \r
        while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||\r
                 ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||\r