Changeset a6610d4 in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-04-12T18:57:45Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3b5129

Parents:

8f8f34ad

Message:

Keyboard callback made static, removed unused report ID

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (3 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                                                           */
 /*----------------------------------------------------------------------------*/
@@ -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);