Changeset a8ac368 in mainline for uspace/drv/usbkbd/kbddev.c

Timestamp:

2011-03-29T20:08:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fc883bb

Parents:

0d92638 (diff), 51e5608 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

development changes

File:

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

uspace/drv/usbkbd/kbddev.c

@@ -602 +602 @@
 //      int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
 //          callbacks, kbd_dev);
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+        
         int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
-            actual_size, callbacks, kbd_dev);
+            actual_size, path, USB_HID_PATH_COMPARE_STRICT, callbacks, kbd_dev);
+
+        usb_hid_report_path_free (path);
         
         if (rc != EOK) {
@@ -704 +709 @@
         
         /* TODO: does not work! */
-        if (dev->pipes[USB_KBD_POLL_EP_NO].interface_no < 0) {
+        if (!dev->pipes[USB_KBD_POLL_EP_NO].present) {
                 usb_log_warning("Required endpoint not found - probably not "
                     "a supported device.\n");
@@ -747 +752 @@
          * TODO: make more general
          */
-        usb_hid_report_path_t path;
-        path.usage_page = USB_HIDUT_PAGE_KEYBOARD;
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        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);
+            kbd_dev->parser, path, USB_HID_PATH_COMPARE_STRICT);
+        usb_hid_report_path_free (path);
         
         usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);