Added new HID_HOST_BOOT_PROTOCOL_ONLY compile time token to reduce the size of the...

[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 d94c2db..9927219 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -153,6 +153,7 @@ void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 \r
 }\r
 \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
@@ -168,7 +169,8 @@ uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
        \r
        return USB_Host_SendControlRequest(Buffer);\r
 }                                                                                         \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
@@ -181,11 +183,8 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
        \r
        uint16_t ReportSize;\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
@@ -197,6 +196,11 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                \r
                ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);\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
@@ -207,28 +211,17 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
        return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
-uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint8_t ReportID, void* Buffer,\r
-                                const 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
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
          return false;\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
+#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
+       if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)\r
        {\r
                uint8_t ErrorCode;\r
        \r
@@ -246,6 +239,26 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                \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        = 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
 bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
@@ -295,6 +308,7 @@ uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInf
        return HOST_SENDCONTROL_Successful;\r
 }\r
 \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
@@ -346,5 +360,6 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 \r
        return 0;\r
 }\r
+#endif\r
 \r
 #endif\r