Changeset bd2394b in mainline for uspace/drv

Timestamp:

2011-05-07T10:53:41Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

cc5908e

Parents:

ba17f5b

Message:

Removed functions for returning size of report for usage path

Location:

uspace/drv

Files:

• usbhid/kbd/kbddev.c (modified) (3 diffs)
• usbhid/lgtch-ultrax/lgtch-ultrax.c (modified) (1 diff)
• usbhid/usbhid.c (modified) (1 diff)
• usbkbd/kbddev.c (modified) (2 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -693 +693 @@
         
         while (field != NULL) {
-                usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
-                    field, field->value, field->usage);
+                //usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
+                //    field, field->value, field->usage);
                 
                 assert(i < kbd_dev->key_count);
@@ -858 +858 @@
         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);
         
@@ -901 +900 @@
             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", 

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -300 +300 @@
         usb_hid_report_path_set_report_id(path, 1);
         
-        lgtch_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        lgtch_dev->key_count = usb_hid_report_size(hid_dev->report, 1, 
+                USB_HID_REPORT_TYPE_INPUT);
+        
         usb_hid_report_path_free(path);
         

uspace/drv/usbhid/usbhid.c

@@ -201 +201 @@
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-        size_t size = usb_hid_report_input_length(hid_dev->report, usage_path, 
-            mapping->compare);
+        size_t size = usb_hid_report_size(hid_dev->report, mapping->report_id, 
+            USB_HID_REPORT_TYPE_INPUT);
         usb_log_debug("Size of the input report: %zuB\n", size);
         

uspace/drv/usbkbd/kbddev.c

@@ -771 +771 @@
         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);
+        kbd_dev->key_count = usb_hid_report_size(
+            kbd_dev->parser, 0, USB_HID_REPORT_TYPE_INPUT);
         usb_hid_report_path_free (path);
         
@@ -803 +803 @@
         usb_hid_report_path_set_report_id(kbd_dev->led_path, 0x00);
         
-        kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, 
-            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(kbd_dev->parser, 0, 
+            USB_HID_REPORT_TYPE_OUTPUT);
         
         usb_log_debug("Output report size (in items): %zu\n",