Bluetooth demo can now create and maintain logical channels - need to determine why...

[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 3cd9394..5d5d2ef 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define INCLUDE_FROM_HID_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_HID_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_HID_DRIVER\r
 #include "HID.h"\r
 \r
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
@@ -157,7 +159,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
-               .wValue        = (REPORT_ITEM_TYPE_In << 8) | ReportID,\r
+               .wValue        = ((REPORT_ITEM_TYPE_In + 1) << 8) | ReportID,\r
                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
                .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In),\r
        };\r
@@ -179,6 +181,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
        Pipe_Unfreeze();\r
        \r
        uint16_t ReportSize;\r
+       uint8_t* BufferPos = Buffer;\r
 \r
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)\r
        if (!(HIDInterfaceInfo->State.UsingBootProtocol))\r
@@ -188,7 +191,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)\r
                {\r
                        ReportID = Pipe_Read_Byte();\r
-                       *((uint8_t*)Buffer++) = ReportID;\r
+                       *(BufferPos++) = ReportID;\r
                }\r
                \r
                ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);\r
@@ -199,7 +202,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                ReportSize = Pipe_BytesInPipe();\r
        }\r
 \r
-       if ((ErrorCode = Pipe_Read_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
+       if ((ErrorCode = Pipe_Read_Stream_LE(BufferPos, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r
         \r
        Pipe_ClearIN();         \r
@@ -244,7 +247,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
-                       .wValue        = (REPORT_ITEM_TYPE_Out << 8) | ReportID,\r
+                       .wValue        = ((REPORT_ITEM_TYPE_Out + 1) << 8) | ReportID,\r
 #else\r
                        .wValue        = 0,\r
 #endif\r