Fix TeensyHID bootloader - change vendor page in the descriptors to match the undocum...

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index 5ac5b8d..2252273 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -52,13 +52,14 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
        {\r
                .Config =\r
                        {\r
-                               .InterfaceNumber         = 0,\r
+                               .InterfaceNumber              = 0,\r
 \r
-                               .ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,\r
-                               .ReportINEndpointSize    = HID_EPSIZE,\r
+                               .ReportINEndpointNumber       = KEYBOARD_IN_EPNUM,\r
+                               .ReportINEndpointSize         = HID_EPSIZE,\r
+                               .ReportINEndpointDoubleBank   = false,\r
 \r
-                               .PrevReportINBuffer      = PrevKeyboardHIDReportBuffer,\r
-                               .PrevReportINBufferSize  = sizeof(PrevKeyboardHIDReportBuffer),\r
+                               .PrevReportINBuffer           = PrevKeyboardHIDReportBuffer,\r
+                               .PrevReportINBufferSize       = sizeof(PrevKeyboardHIDReportBuffer),\r
                        },\r
        };\r
        \r
@@ -158,17 +159,19 @@ void EVENT_USB_Device_StartOfFrame(void)
  *\r
  *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
  *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ *  \param[in] ReportType  Type of the report to create, either REPORT_ITEM_TYPE_In or REPORT_ITEM_TYPE_Feature\r
  *  \param[out] ReportData  Pointer to a buffer where the created report should be stored\r
  *  \param[out] ReportSize  Number of bytes written in the report (or zero if no report is to be sent\r
  *\r
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
  */\r
 bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
-                                         void* ReportData, uint16_t* ReportSize)\r
+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)\r
 {\r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 \r
+       /* Determine which interface must have its report generated */\r
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
        {\r
                USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;\r
@@ -206,10 +209,10 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                else if (JoyStatus_LCL & JOY_DOWN)\r
                  MouseReport->Y =  1;\r
 \r
-               if (JoyStatus_LCL & JOY_RIGHT)\r
-                 MouseReport->X =  1;\r
-               else if (JoyStatus_LCL & JOY_LEFT)\r
+               if (JoyStatus_LCL & JOY_LEFT)\r
                  MouseReport->X = -1;\r
+               else if (JoyStatus_LCL & JOY_RIGHT)\r
+                 MouseReport->X =  1;\r
 \r
                if (JoyStatus_LCL & JOY_PRESS)\r
                  MouseReport->Button  = (1 << 0);\r