Changeset 175ad13e in mainline for uspace/drv/usbkbd/kbddev.c

Timestamp:

2011-04-15T15:19:34Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

681f24b3

Parents:

9698695

Message:

new report structure

File:

• uspace/drv/usbkbd/kbddev.c (modified) (6 diffs)

uspace/drv/usbkbd/kbddev.c

@@ -290 +290 @@
         usb_log_debug("Creating output report.\n");
         
-        int rc = usb_hid_report_output_translate(kbd_dev->parser, 
-            kbd_dev->led_path, USB_HID_PATH_COMPARE_END, kbd_dev->output_buffer, 
-            kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size);
+        int rc = usb_hid_report_output_translate(kbd_dev->parser, 0,
+            kbd_dev->output_buffer, kbd_dev->output_size);
         
         if (rc != EOK) {
@@ -612 +611 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 
-        int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
-            actual_size, path, USB_HID_PATH_COMPARE_STRICT, callbacks, kbd_dev);
+        int rc = usb_hid_parse_report(kbd_dev->parser, buffer, actual_size);
 
         usb_hid_report_path_free (path);
@@ -657 +655 @@
         memset(kbd_dev, 0, sizeof(usb_kbd_t));
         
-        kbd_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
-            usb_hid_report_parser_t)));
+        kbd_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
+            usb_hid_report_t)));
         if (kbd_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
@@ -726 +724 @@
         
         /* 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;
-        }
+        //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. */
@@ -762 +760 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         kbd_dev->key_count = usb_hid_report_input_length(
-            kbd_dev->parser, path, USB_HID_PATH_COMPARE_STRICT);
+            kbd_dev->parser, path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         usb_hid_report_path_free (path);
         
@@ -924 +922 @@
         // destroy the parser
         if ((*kbd_dev)->parser != NULL) {
-                usb_hid_free_report_parser((*kbd_dev)->parser);
+                usb_hid_free_report((*kbd_dev)->parser);
         }