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

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

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

uspace/drv/usbkbd/kbddev.c

@@ -268 +268 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
+        if (kbd_dev->output_size == 0) {
+                return;
+        }
+
         unsigned i = 0;
         
@@ -544 +548 @@
  *                  according to HID Usage Tables.
  * @param count Number of key codes in report (size of the report).
- * @param modifiers Bitmap of modifiers (Ctrl, Alt, Shift, GUI).
+ * @param report_id
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -551 +555 @@
  */
 static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
-    uint8_t modifiers, void *arg)
+    uint8_t report_id, void *arg)
 {
         if (arg == NULL) {
@@ -562 +566 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser (report id: %d): %s\n", modifiers, 
+        usb_log_debug("Got keys from parser (report id: %d): %s\n", report_id, 
             usb_debug_str_buffer(key_codes, count, 0));
         
@@ -763 +767 @@
         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);
+        
         kbd_dev->key_count = usb_hid_report_input_length(
             kbd_dev->parser, path, USB_HID_PATH_COMPARE_END);
@@ -796 +803 @@
         
         kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, 
-            kbd_dev->led_path, USB_HID_PATH_COMPARE_END);
+            kbd_dev->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         
         usb_log_debug("Output report size (in items): %zu\n",