Added multiple Report ID support to the HID class driver. Removed OUT endpoint suppor...

[pub/USBasp.git] / Demos / Device / KeyboardMouse / KeyboardMouse.c

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index e68a247..5cea555 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -48,9 +48,6 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
 \r
                .ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,\r
                .ReportINEndpointSize    = HID_EPSIZE,\r
 \r
                .ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,\r
                .ReportINEndpointSize    = HID_EPSIZE,\r

-\r
-               .ReportOUTEndpointNumber = KEYBOARD_OUT_EPNUM,\r
-               .ReportOUTEndpointSize   = HID_EPSIZE,\r

                \r
                .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
 \r
                \r
                .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
 \r


@@ -70,9 +67,6 @@ USB_ClassInfo_HID_t Mouse_HID_Interface =
                .ReportINEndpointSize    = HID_EPSIZE,\r
 \r
                .ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),\r
                .ReportINEndpointSize    = HID_EPSIZE,\r
 \r
                .ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),\r

-\r
-               .ReportOUTEndpointNumber = 0,\r
-               .ReportOUTEndpointSize   = 0,\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -162,7 +156,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *\r
  *  \return Number of bytes written in the report (or zero if no report is to be sent\r
  */\r
  *\r
  *  \return Number of bytes written in the report (or zero if no report is to be sent\r
  */\r

-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)\r
+uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r

 {\r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 {\r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r


@@ -221,7 +215,8 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
  *  \param ReportData  Pointer to a buffer where the created report has been stored\r
  *  \param ReportSize  Size in bytes of the received HID report\r
  */\r
  *  \param ReportData  Pointer to a buffer where the created report has been stored\r
  *  \param ReportSize  Size in bytes of the received HID report\r
  */\r

-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData, uint16_t ReportSize)\r
+void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
+                                               void* ReportData, uint16_t ReportSize)\r

 {\r
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
        {\r
 {\r
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
        {\r