Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[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 42e3262..ff7ed86 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -48,7 +48,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\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
@@ -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
@@ -93,7 +93,7 @@ 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_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)\r
@@ -108,7 +108,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
        {\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
@@ -131,7 +131,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                        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_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)\r