Changeset 2f593872 in mainline

Timestamp:

2011-03-08T20:48:57Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

7351dc3

Parents:

32bfb96

Message:

Printing of descriptor + turned on report parsing.

Location:

uspace/drv/usbhid

Files:

• hiddev.c (modified) (1 diff)
• kbddev.c (modified) (2 diffs)

uspace/drv/usbhid/hiddev.c

@@ -234 +234 @@
         }
         
+        usb_hid_descriptor_print(hid_dev->parser);
+        
         return EOK;
 }

uspace/drv/usbhid/kbddev.c

@@ -440 +440 @@
         callbacks->keyboard = usbhid_kbd_process_keycodes;
 
-        usb_log_debug("Calling usb_hid_boot_keyboard_input_report() with "
+        usb_log_debug("Calling usb_hid_parse_report() with "
             "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
         
-        int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
-            callbacks, kbd_dev);
+//      int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
+//          callbacks, kbd_dev);
+        int rc = usb_hid_parse_report(kbd_dev->hid_dev->parser, buffer,
+            actual_size, callbacks, kbd_dev);
         
         if (rc != EOK) {
@@ -558 +560 @@
         assert(kbd_dev->hid_dev != NULL);
         assert(kbd_dev->hid_dev->initialized);
-        usbhid_req_set_protocol(kbd_dev->hid_dev, USB_HID_PROTOCOL_BOOT);
+        //usbhid_req_set_protocol(kbd_dev->hid_dev, USB_HID_PROTOCOL_BOOT);
         
         usbhid_kbd_set_led(kbd_dev);