Changeset 1c6f4ff in mainline for uspace/drv/usbkbd/kbddev.c

Timestamp:

2011-04-08T07:58:15Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8b74997f

Parents:

a8a7063 (diff), fec47d4 (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:

General HID driver for handling all HID devices.

Now handles only keyboard. For generic HID device and mouse there are some
dummy functions.

File:

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

uspace/drv/usbkbd/kbddev.c

@@ -265 +265 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
+        if (kbd_dev->output_size == 0) {
+                return;
+        }
+        
         unsigned i = 0;
         
@@ -288 +292 @@
         
         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->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+            kbd_dev->output_buffer, 
             kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size);
         
@@ -539 +545 @@
  *                  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.
@@ -546 +552 @@
  */
 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) {
@@ -557 +563 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser: %s\n", 
-            usb_debug_str_buffer(key_codes, count, 0));
+        usb_log_debug("Got keys from parser (report id: %u): %s\n", 
+            report_id, usb_debug_str_buffer(key_codes, count, 0));
         
         if (count != kbd_dev->key_count) {
@@ -608 +614 @@
         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);
         
         int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
-            actual_size, path, USB_HID_PATH_COMPARE_STRICT, callbacks, kbd_dev);
+            actual_size, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+            callbacks, kbd_dev);
 
         usb_hid_report_path_free (path);
@@ -758 +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_STRICT);
+            kbd_dev->parser, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         usb_hid_report_path_free (path);
         
@@ -777 +790 @@
         kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, 
             &kbd_dev->output_size);
-        if (kbd_dev->output_buffer == NULL) {
+        if (kbd_dev->output_buffer == NULL && kbd_dev->output_size != 0) {
                 usb_log_warning("Error creating output report buffer.\n");
                 free(kbd_dev->keys);
@@ -790 +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",