Changeset 82d04a48 in mainline for uspace/drv/usbhid/kbddev.c

Timestamp:

2011-03-22T19:32:13Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

81da2e7f

Parents:

f8e4cb6

Message:

Fix: forgot initialization of HID parser.

File:

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

uspace/drv/usbhid/kbddev.c

@@ -929 +929 @@
         memset(kbd_dev, 0, sizeof(usbhid_kbd_t));
         
+        kbd_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
+            usb_hid_report_parser_t)));
+        if (kbd_dev->parser == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(kbd_dev);
+                return NULL;
+        }
+        
         kbd_dev->console_phone = -1;
         kbd_dev->initialized = USBHID_KBD_STATUS_UNINITIALIZED;
@@ -996 +1004 @@
         kbd_dev->usb_dev = dev;
         
-        /* Get the report descriptor and initialize report parser. */
+        /* Initialize the report parser. */
+        rc = usb_hid_parser_init(kbd_dev->parser);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize report parser.\n");
+                return rc;
+        }
+        
+        /* Get the report descriptor and parse it. */
         rc = usbhid_kbd_process_report_descriptor(kbd_dev);
         if (rc != EOK) {
@@ -1132 +1147 @@
         }
         
+        // destroy the parser
+        if ((*kbd_dev)->parser != NULL) {
+                usb_hid_free_report_parser((*kbd_dev)->parser);
+        }
+        
         /* TODO: what about the USB device structure?? */