Changeset b9e3aa3 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-05-30T14:13:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f3f9733

Parents:

2002595 (diff), 8357fc9 (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:

Development changes (a lot of stuff)

File:

• uspace/drv/usbhid/usbhid.c (modified) (1 diff)

uspace/drv/usbhid/usbhid.c

@@ -217 +217 @@
 //          USB_HID_REPORT_TYPE_INPUT);
         size_t size = 0;
-        usb_hid_report_field_t *field = usb_hid_report_get_sibling (hid_dev->report,
-                NULL, usage_path, mapping->compare, USB_HID_REPORT_TYPE_INPUT);
-        while(field != NULL) {
-                size++;
-                field = usb_hid_report_get_sibling (hid_dev->report,
+
+        usb_hid_report_description_t *report_des = 
+                usb_hid_report_find_description(hid_dev->report,
+                mapping->report_id, USB_HID_REPORT_TYPE_INPUT);
+
+        while(report_des != NULL) {
+
+                if((mapping->report_id) == 0 && (report_des->report_id != 0)) {
+                        usb_hid_report_path_set_report_id(usage_path,
+                                report_des->report_id);
+                }
+
+                usb_hid_report_field_t *field = usb_hid_report_get_sibling (
+                        hid_dev->report,
+                        NULL, usage_path, mapping->compare, 
+                        USB_HID_REPORT_TYPE_INPUT);
+
+                while(field != NULL) {
+                        size++;
+                        field = usb_hid_report_get_sibling (hid_dev->report,
                                         field, usage_path, mapping->compare, 
                             USB_HID_REPORT_TYPE_INPUT);
+                }
+
+                if((mapping->report_id == 0) && (report_des->report_id != 0)) {
+                        uint8_t report_id = usb_hid_get_next_report_id(
+                                hid_dev->report, report_des->report_id,
+                                USB_HID_REPORT_TYPE_INPUT);
+
+                        if(report_id == 0) {
+                                break;
+                        }
+
+                        report_des = usb_hid_report_find_description(
+                                hid_dev->report, report_id, 
+                                USB_HID_REPORT_TYPE_INPUT);
+                }
+                else {
+                        break;
+                }
         }