Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

[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 238e099..8b104ef 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -46,9 +46,9 @@ 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_SetPipeToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r
 \r
        Pipe_Unfreeze();\r
@@ -58,7 +58,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \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
@@ -68,7 +68,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)\r
        {\r
-               Pipe_SetToken(PIPE_TOKEN_IN);\r
+               Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
                \r
                if (DataStream != NULL)\r
                {\r
@@ -76,7 +76,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                        {\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
@@ -93,27 +93,27 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                        }\r
                }\r
 \r
-               Pipe_SetToken(PIPE_TOKEN_OUT);\r
+               Pipe_SetPipeToken(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
-               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
        {\r
                if (DataStream != NULL)\r
                {\r
-                       Pipe_SetToken(PIPE_TOKEN_OUT);\r
+                       Pipe_SetPipeToken(PIPE_TOKEN_OUT);\r
                        Pipe_Unfreeze();        \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
@@ -125,16 +125,16 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                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
                }\r
                \r
-               Pipe_SetToken(PIPE_TOKEN_IN);\r
+               Pipe_SetPipeToken(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
@@ -151,7 +151,7 @@ End_Of_Control_Send:
        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
        #if (USB_HOST_TIMEOUT_MS < 0xFF)\r
        uint8_t  TimeoutCounter = USB_HOST_TIMEOUT_MS;  \r