Changes in uspace/drv/usbhid/kbd/kbddev.c [60c0573:4125b7d] in mainline

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (4 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -176 +176 @@
 
 /*----------------------------------------------------------------------------*/
+
+static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
+    uint8_t report_id, void *arg);
+
+static const usb_hid_report_in_callbacks_t usb_kbd_parser_callbacks = {
+        .keyboard = usb_kbd_process_keycodes
+};
+
+/*----------------------------------------------------------------------------*/
 /* Keyboard layouts                                                           */
 /*----------------------------------------------------------------------------*/
@@ -598 +607 @@
         
         if (count != kbd_dev->key_count) {
-                usb_log_warning("Number of received keycodes (%d) differs from"
-                    " expected number (%d).\n", count, kbd_dev->key_count);
+                usb_log_warning("Number of received keycodes (%zu) differs from"
+                    " expected (%zu).\n", count, kbd_dev->key_count);
                 return;
         }
@@ -630 +639 @@
 {
         assert(hid_dev->parser != NULL);
-        
-        usb_hid_report_in_callbacks_t *callbacks =
-            (usb_hid_report_in_callbacks_t *)malloc(
-                sizeof(usb_hid_report_in_callbacks_t));
-        
-        callbacks->keyboard = usb_kbd_process_keycodes;
 
         usb_log_debug("Calling usb_hid_parse_report() with "
@@ -644 +647 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-        usb_hid_report_path_set_report_id(path, 0);
+        //usb_hid_report_path_set_report_id(path, 0);
         
         int rc = usb_hid_parse_report(hid_dev->parser, buffer,
             actual_size, path, 
             USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            callbacks, hid_dev);
+            &usb_kbd_parser_callbacks, hid_dev);
 
         usb_hid_report_path_free(path);