Fix errors in the KeyboardHost demo which prevented correct compilation.

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / USBTask.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 6967023..e1c0659 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#include "../LowLevel/USBMode.h"\r
+#include "USBMode.h"\r

 \r
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r
 \r
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r


@@ -64,7 +64,7 @@ static void USB_DeviceTask(void)
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r

-               if (Endpoint_IsSetupReceived())\r
+               if (Endpoint_IsSETUPReceived())\r

                {\r
                        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)\r
                        {\r
                {\r
                        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)\r
                        {\r


@@ -86,6 +86,10 @@ static void USB_HostTask(void)
        static uint16_t WaitMSRemaining;\r
        static uint8_t  PostWaitState;\r
 \r
        static uint16_t WaitMSRemaining;\r
        static uint8_t  PostWaitState;\r
 \r

+       uint8_t PrevPipe = Pipe_GetCurrentPipe();\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        switch (USB_HostState)\r
        {\r
                case HOST_STATE_WaitForDevice:\r
        switch (USB_HostState)\r
        {\r
                case HOST_STATE_WaitForDevice:\r


@@ -94,7 +98,7 @@ static void USB_HostTask(void)
                                if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
                                {\r
                                        USB_HostState = PostWaitState;\r
                                if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
                                {\r
                                        USB_HostState = PostWaitState;\r

-                                       ErrorCode    = HOST_ENUMERROR_WaitStage;\r
+                                       ErrorCode     = HOST_ENUMERROR_WaitStage;\r

                                        break;\r
                                }\r
                                \r
                                        break;\r
                                }\r
                                \r


@@ -167,11 +171,11 @@ static void USB_HostTask(void)
                case HOST_STATE_Default:\r
                        USB_HostRequest = (USB_Host_Request_Header_t)\r
                                {\r
                case HOST_STATE_Default:\r
                        USB_HostRequest = (USB_Host_Request_Header_t)\r
                                {\r

-                                       bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       bRequest:      REQ_GetDescriptor,\r
-                                       wValue:        (DTYPE_Device << 8),\r
-                                       wIndex:        0,\r
-                                       wLength:       PIPE_CONTROLPIPE_DEFAULT_SIZE,\r
+                                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_GetDescriptor,\r
+                                       .wValue        = (DTYPE_Device << 8),\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = PIPE_CONTROLPIPE_DEFAULT_SIZE,\r

                                };\r
 \r
                        uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];\r
                                };\r
 \r
                        uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];\r


@@ -212,11 +216,11 @@ static void USB_HostTask(void)
                        \r
                        USB_HostRequest = (USB_Host_Request_Header_t)\r
                                {\r
                        \r
                        USB_HostRequest = (USB_Host_Request_Header_t)\r
                                {\r

-                                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       bRequest:      REQ_SetAddress,\r
-                                       wValue:        USB_HOST_DEVICEADDRESS,\r
-                                       wIndex:        0,\r
-                                       wLength:       0,\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_SetAddress,\r
+                                       .wValue        = USB_HOST_DEVICEADDRESS,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r

                                };\r
 \r
                        if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
                                };\r
 \r
                        if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r


@@ -249,5 +253,7 @@ static void USB_HostTask(void)
 \r
                USB_ResetInterface();\r
        }\r
 \r
                USB_ResetInterface();\r
        }\r

+       \r
+       Pipe_SelectPipe(PrevPipe);\r

 }\r
 #endif\r
 }\r
 #endif\r