Speed up bit-banged USART code in the AVRISP project.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / HID.c

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index d01d312..75b37b0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -34,10 +34,8 @@
 #define INCLUDE_FROM_HID_CLASS_HOST_C\r
 #include "HID.h"\r
 \r
 #define INCLUDE_FROM_HID_CLASS_HOST_C\r
 #include "HID.h"\r
 \r

-#warning The HID Host mode Class driver is currently incomplete and is for preview purposes only.\r
-\r
-uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                uint8_t* ConfigDescriptorData)\r
+uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+                                void* ConfigDescriptorData)\r

 {\r
        uint8_t FoundEndpoints = 0;\r
 \r
 {\r
        uint8_t FoundEndpoints = 0;\r
 \r


@@ -86,7 +84,8 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
                if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
                if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r

-                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+                                                          HIDInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r

                        HIDInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
                        \r
                        FoundEndpoints |= HID_FOUND_DATAPIPE_IN;\r
                        HIDInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
                        \r
                        FoundEndpoints |= HID_FOUND_DATAPIPE_IN;\r


@@ -94,7 +93,8 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
                else\r
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,\r
                else\r
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,\r

-                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
+                                                          HIDInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r

                        HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
                        \r
                        HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;\r
                        HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
                        \r
                        HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;\r


@@ -103,11 +103,12 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
                }\r
        }\r
 \r
                }\r
        }\r
 \r

+       HIDInterfaceInfo->State.LargestReportSize = 8;\r

        HIDInterfaceInfo->State.IsActive = true;\r
        return HID_ENUMERROR_NoError;\r
 }\r
 \r
        HIDInterfaceInfo->State.IsActive = true;\r
        return HID_ENUMERROR_NoError;\r
 }\r
 \r

-static uint8_t DComp_HID_Host_NextHIDInterface(void* CurrentDescriptor)\r
+static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r


@@ -121,7 +122,7 @@ static uint8_t DComp_HID_Host_NextHIDInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

-static uint8_t DComp_NextHID(void* CurrentDescriptor)\r
+static uint8_t DComp_NextHID(void* const CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)\r
          return DESCRIPTOR_SEARCH_Found;\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)\r
          return DESCRIPTOR_SEARCH_Found;\r


@@ -131,7 +132,7 @@ static uint8_t DComp_NextHID(void* CurrentDescriptor)
          return DESCRIPTOR_SEARCH_NotFound;      \r
 }\r
 \r
          return DESCRIPTOR_SEARCH_NotFound;      \r
 }\r
 \r

-static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r


@@ -149,86 +150,78 @@ static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

-void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
 {\r

-\r
+       (void)HIDInterfaceInfo;\r

 }\r
 \r
 }\r
 \r

-uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, bool ControlRequest, uint8_t* ReportID, void* Buffer)\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, const uint8_t ReportID, void* Buffer)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+       {\r
+               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+               .bRequest      = REQ_SetReport,\r
+               .wValue        = (REPORT_ITEM_TYPE_In << 8) | ReportID,\r
+               .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
+               .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In),\r
+       };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(Buffer);\r
+}                                                                                         \r
+#endif\r
+                                                                                  \r
+uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, void* Buffer)\r

 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r

-         return false;\r
+         return PIPE_READYWAIT_DeviceDisconnected;\r

 \r
 \r

-       if (ControlRequest)\r
-       {\r
-               USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       .bRequest      = REQ_SetReport,\r
-                       .wValue        = *ReportID,\r
-                       .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
-                       .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, *ReportID, REPORT_ITEM_TYPE_In),\r
-               };\r
+       uint8_t ErrorCode;\r

 \r
 \r

-               Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-               \r
-               return USB_Host_SendControlRequest(Buffer);\r
-       }\r
-       else\r
-       {\r
-               uint8_t ErrorCode;\r
+       Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_Unfreeze();\r

        \r
        \r

-               Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
-               Pipe_Unfreeze();\r
-               \r
-               uint16_t ReportSize;\r
+       uint16_t ReportSize;\r

 \r
 \r

-               if (HIDInterfaceInfo->State.UsingBootProtocol)\r
-               {\r
-                       ReportSize = Pipe_BytesInPipe();\r
-               }\r
-               else\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+       if (!(HIDInterfaceInfo->State.UsingBootProtocol))\r
+       {\r
+               uint8_t ReportID = 0;\r
+       \r
+               if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)\r

                {\r
                {\r

-                       if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)\r
-                               *ReportID = Pipe_Read_Byte();\r
-                       else\r
-                               *ReportID = 0;\r
-                       \r
-                       ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, *ReportID, REPORT_ITEM_TYPE_In);\r
+                       ReportID = Pipe_Read_Byte();\r
+                       *((uint8_t*)Buffer++) = ReportID;\r

                }\r
                }\r

-\r
-               if ((ErrorCode = Pipe_Read_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
-                 return ErrorCode;\r
-                \r
-               Pipe_ClearIN();         \r
-               Pipe_Freeze();\r

                \r
                \r

-               return PIPE_RWSTREAM_NoError;           \r
+               ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);\r

        }\r
        }\r

+       else\r
+#endif\r
+       {\r
+               ReportSize = Pipe_BytesInPipe();\r
+       }\r
+\r
+       if ((ErrorCode = Pipe_Read_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
+         return ErrorCode;\r
+        \r
+       Pipe_ClearIN();         \r
+       Pipe_Freeze();\r
+       \r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 }\r
 \r

-uint8_t HID_Host_SendReport(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint8_t ReportID, void* Buffer, uint16_t ReportSize)\r
+uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+                                const uint8_t ReportID,\r
+#endif\r
+                                void* Buffer, const uint16_t ReportSize)\r

 {\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
-         return false;\r
-         \r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r

        if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
        {\r
        if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
        {\r

-               USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       .bRequest      = REQ_SetReport,\r
-                       .wValue        = ReportID,\r
-                       .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
-                       .wLength       = ReportSize,\r
-               };\r
-\r
-               Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-               \r
-               return USB_Host_SendControlRequest(Buffer);\r
-       }\r
-       else\r
-       {\r

                uint8_t ErrorCode;\r
        \r
                Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipeNumber);\r
                uint8_t ErrorCode;\r
        \r
                Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipeNumber);\r


@@ -245,9 +238,29 @@ uint8_t HID_Host_SendReport(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint8_t
                \r
                return PIPE_RWSTREAM_NoError;\r
        }\r
                \r
                return PIPE_RWSTREAM_NoError;\r
        }\r

+       else\r
+#endif\r
+       {\r
+               USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                       .bRequest      = REQ_SetReport,\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+                       .wValue        = (REPORT_ITEM_TYPE_Out << 8) | ReportID,\r
+#else\r
+                       .wValue        = 0,\r
+#endif\r
+                       .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
+                       .wLength       = ReportSize,\r
+               };\r
+\r
+               Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+               \r
+               return USB_Host_SendControlRequest(Buffer);\r
+       }\r

 }\r
 \r
 }\r
 \r

-bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
          return false;\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
          return false;\r


@@ -264,7 +277,7 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)
        return ReportReceived;\r
 }\r
 \r
        return ReportReceived;\r
 }\r
 \r

-uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r


@@ -285,12 +298,14 @@ uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)
        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
 \r

+       HIDInterfaceInfo->State.LargestReportSize = 8;\r

        HIDInterfaceInfo->State.UsingBootProtocol = true;\r
        \r
        return HOST_SENDCONTROL_Successful;\r
 }\r
 \r
        HIDInterfaceInfo->State.UsingBootProtocol = true;\r
        \r
        return HOST_SENDCONTROL_Successful;\r
 }\r
 \r

-uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r


@@ -310,30 +325,37 @@ uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInf
        if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
          \r
        if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
          \r

-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                       .bRequest      = REQ_SetProtocol,\r
-                       .wValue        = 1,\r
-                       .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
-                       .wLength       = 0,\r
-               };\r
-\r
-       if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
-         return ErrorCode;\r
+       if (HIDInterfaceInfo->State.UsingBootProtocol)\r
+       {\r
+               USB_ControlRequest = (USB_Request_Header_t)\r
+                       {\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                               .bRequest      = REQ_SetProtocol,\r
+                               .wValue        = 1,\r
+                               .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
+                               .wLength       = 0,\r
+                       };\r
+\r
+               if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+                 return ErrorCode;\r

 \r
 \r

-       HIDInterfaceInfo->State.UsingBootProtocol = false;\r
+               HIDInterfaceInfo->State.UsingBootProtocol = false;\r
+       }\r

        \r
        if (HIDInterfaceInfo->Config.HIDParserData == NULL)\r
          return HID_ERROR_LOGICAL;\r
        \r
        if (HIDInterfaceInfo->Config.HIDParserData == NULL)\r
          return HID_ERROR_LOGICAL;\r

-         \r
+               \r

        if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,\r
                                              HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)\r
        {\r
                return HID_ERROR_LOGICAL | ErrorCode;\r
        }\r
 \r
        if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,\r
                                              HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)\r
        {\r
                return HID_ERROR_LOGICAL | ErrorCode;\r
        }\r
 \r

+       uint8_t LargestReportSizeBits = HIDInterfaceInfo->Config.HIDParserData->LargestReportSizeBits;\r
+       HIDInterfaceInfo->State.LargestReportSize = (LargestReportSizeBits >> 3) + ((LargestReportSizeBits & 0x07) != 0);\r
+\r

        return 0;\r
 }\r
        return 0;\r
 }\r

+#endif\r

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