Additional file renames and modifications to change CDC demos to VirtualSerial.

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

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 2918f5a..6664831 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -131,20 +131,20 @@ 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
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;\r
        \r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 \r
-       static uint8_t PrevUsedKeyCodes;\r
        uint8_t UsedKeyCodes = 0;\r
        \r
        if (JoyStatus_LCL & JOY_UP)\r
@@ -162,15 +162,6 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
          KeyboardReport->KeyCode[UsedKeyCodes++] = 0x09; // F\r
-       \r
-       /* The host will ignore the device if we add a new keycode to the report while another keycode is currently\r
-        * being sent (i.e. the user has pressed another key while a key is already being pressed) - we need to intersperse\r
-        * the two reports with a zeroed report to force the host to accept the additional keys */\r
-       if (UsedKeyCodes != PrevUsedKeyCodes)\r
-       {\r
-               memset(KeyboardReport, sizeof(USB_KeyboardReport_Data_t), 0x00);\r
-               PrevUsedKeyCodes = UsedKeyCodes;\r
-       }\r
 \r
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r
        return false;\r