Clean up RNDIS demo type define names.

[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 dfc3f44..238e099 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -35,15 +35,13 @@
 #define  INCLUDE_FROM_HOSTCHAPTER9_C\r
 #include "HostChapter9.h"\r
 \r
-USB_Host_Request_Header_t USB_HostRequest;\r
-\r
 uint8_t USB_Host_SendControlRequest(void* BufferPtr)\r
 {\r
-       uint8_t* HeaderStream   = (uint8_t*)&USB_HostRequest;\r
+       uint8_t* HeaderStream   = (uint8_t*)&USB_ControlRequest;\r
        uint8_t* DataStream     = (uint8_t*)BufferPtr;\r
        bool     BusSuspended   = USB_Host_IsBusSuspended();\r
        uint8_t  ReturnStatus   = HOST_SENDCONTROL_Successful;\r
-       uint16_t DataLen        = USB_HostRequest.wLength;\r
+       uint16_t DataLen        = USB_ControlRequest.wLength;\r
 \r
        USB_Host_ResumeBus();\r
        \r
@@ -55,7 +53,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
        Pipe_Unfreeze();\r
 \r
-       for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Host_Request_Header_t); HeaderByte++)\r
+       for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++)\r
          Pipe_Write_Byte(*(HeaderStream++));\r
 \r
        Pipe_ClearSETUP();\r
@@ -68,7 +66,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
-       if ((USB_HostRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)\r
+       if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)\r
        {\r
                Pipe_SetToken(PIPE_TOKEN_IN);\r
                \r
@@ -155,9 +153,13 @@ 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
+       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