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 7d9b3b5..75b37b0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -152,7 +152,7 @@ static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescri
 \r
 void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
 {\r
 \r
 void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
 {\r

-\r
+       (void)HIDInterfaceInfo;\r

 }\r
 \r
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
 }\r
 \r
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r


@@ -162,7 +162,7 @@ uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
        {\r
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                .bRequest      = REQ_SetReport,\r
        {\r
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                .bRequest      = REQ_SetReport,\r

-               .wValue        = ReportID,\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
                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
                .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In),\r
        };\r


@@ -176,7 +176,7 @@ uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 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
 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

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

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


@@ -219,9 +219,6 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
 #endif\r
                                 void* Buffer, const uint16_t ReportSize)\r
 {\r
 #endif\r
                                 void* Buffer, const uint16_t ReportSize)\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 !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
        if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
        {\r


@@ -249,7 +246,7 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                        .bRequest      = REQ_SetReport,\r
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                        .bRequest      = REQ_SetReport,\r
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r

-                       .wValue        = ReportID,\r
+                       .wValue        = (REPORT_ITEM_TYPE_Out << 8) | ReportID,\r

 #else\r
                        .wValue        = 0,\r
 #endif\r
 #else\r
                        .wValue        = 0,\r
 #endif\r


@@ -282,9 +279,6 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 \r
 uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
 {\r
 \r
 uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
 {\r

-       if (HIDInterfaceInfo->State.UsingBootProtocol)\r
-         return HOST_SENDCONTROL_Successful;\r
-\r

        uint8_t ErrorCode;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
        uint8_t ErrorCode;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r