Changeset 3a6e423 in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-05-08T19:38:24Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

7aaf403e

Parents:

7b6f116

Message:

Parsing of usages in case of array items repaired

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (4 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -313 +313 @@
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_OUTPUT);
         
-        while (field != NULL) {
-
+        while (field != NULL) {         
+                
                 if ((field->usage == USB_HID_LED_NUM_LOCK) 
                     && (kbd_dev->mods & KM_NUM_LOCK)){
@@ -334 +334 @@
                 
                 field = usb_hid_report_get_sibling(hid_dev->report, field,
-                    kbd_dev->led_path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 
-                    | USB_HID_PATH_COMPARE_END, USB_HID_REPORT_TYPE_OUTPUT);
+                    kbd_dev->led_path,  
+                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                        USB_HID_REPORT_TYPE_OUTPUT);
         }
         
@@ -865 +866 @@
         usb_hid_report_path_set_report_id(path, 0);
         
-        kbd_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        kbd_dev->key_count = usb_hid_report_size(
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
         usb_hid_report_path_free(path);
         
@@ -908 +908 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
         
-        kbd_dev->led_output_size = usb_hid_report_output_size(hid_dev->report, 
-            kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
+            0, USB_HID_REPORT_TYPE_OUTPUT);
         
         usb_log_debug("Output report size (in items): %zu\n",