Renamed the the TotalHIDReports element of the HID descriptor structure in the HID...

[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 e1c0659..5202cc8 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -33,9 +33,10 @@
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r
 \r
 #define  INCLUDE_FROM_USBTASK_C\r
 #include "USBTask.h"\r
 \r

-volatile bool      USB_IsSuspended;\r
-volatile bool      USB_IsConnected;\r
-volatile bool      USB_IsInitialized;\r
+volatile bool        USB_IsSuspended;\r
+volatile bool        USB_IsConnected;\r
+volatile bool        USB_IsInitialized;\r
+USB_Request_Header_t USB_ControlRequest;\r

 \r
 #if defined(USB_CAN_BE_HOST)\r
 volatile uint8_t   USB_HostState;\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 volatile uint8_t   USB_HostState;\r


@@ -82,12 +83,11 @@ static void USB_HostTask(void)
 {\r
        uint8_t ErrorCode    = HOST_ENUMERROR_NoError;\r
        uint8_t SubErrorCode = HOST_ENUMERROR_NoError;\r
 {\r
        uint8_t ErrorCode    = HOST_ENUMERROR_NoError;\r
        uint8_t SubErrorCode = HOST_ENUMERROR_NoError;\r

+       uint8_t PrevPipe     = Pipe_GetCurrentPipe();\r

        \r
        static uint16_t WaitMSRemaining;\r
        static uint8_t  PostWaitState;\r
 \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
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
 \r
        switch (USB_HostState)\r


@@ -156,7 +156,7 @@ static void USB_HostTask(void)
                        break;\r
                case HOST_STATE_Powered:\r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
                        break;\r
                case HOST_STATE_Powered:\r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r

-                                                          PIPE_TOKEN_SETUP, PIPE_CONTROLPIPE,\r
+                                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r

                                                           PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r
                \r
                        if (!(Pipe_IsConfigured()))\r
                                                           PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            \r
                \r
                        if (!(Pipe_IsConfigured()))\r


@@ -169,16 +169,16 @@ static void USB_HostTask(void)
                        USB_HostState = HOST_STATE_Default;\r
                        break;\r
                case HOST_STATE_Default:\r
                        USB_HostState = HOST_STATE_Default;\r
                        break;\r
                case HOST_STATE_Default:\r

-                       USB_HostRequest = (USB_Host_Request_Header_t)\r
+                       USB_ControlRequest = (USB_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
                                {\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
+                                       .wLength       = 8,\r

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

-                       uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];\r
+                       uint8_t DataBuffer[8];\r

 \r
                        if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)\r
                        {\r
 \r
                        if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)\r
                        {\r


@@ -202,7 +202,7 @@ static void USB_HostTask(void)
                        Pipe_ResetPipe(PIPE_CONTROLPIPE);\r
                        \r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
                        Pipe_ResetPipe(PIPE_CONTROLPIPE);\r
                        \r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r

-                                          PIPE_TOKEN_SETUP, PIPE_CONTROLPIPE,\r
+                                          PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r

                                           USB_ControlPipeSize, PIPE_BANK_SINGLE);\r
 \r
                        if (!(Pipe_IsConfigured()))\r
                                           USB_ControlPipeSize, PIPE_BANK_SINGLE);\r
 \r
                        if (!(Pipe_IsConfigured()))\r


@@ -214,7 +214,7 @@ static void USB_HostTask(void)
 \r
                        Pipe_SetInfiniteINRequests();\r
                        \r
 \r
                        Pipe_SetInfiniteINRequests();\r
                        \r

-                       USB_HostRequest = (USB_Host_Request_Header_t)\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r

                                {\r
                                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
                                        .bRequest      = REQ_SetAddress,\r
                                {\r
                                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
                                        .bRequest      = REQ_SetAddress,\r