Changeset dcb7d7cd in mainline

Timestamp:

2011-05-30T14:06:39Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

8357fc9

Parents:

ee7e7c93

Message:

subdrivers matching without specified report_id

Location:

uspace

Files:

• drv/usbhid/usbhid.c (modified) (1 diff)
• lib/usbhid/src/hiddescriptor.c (modified) (1 diff)
• lib/usbhid/src/hidpath.c (modified) (1 diff)

uspace/drv/usbhid/usbhid.c

@@ -207 +207 @@
 //          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;
+                }
         }
         

uspace/lib/usbhid/src/hiddescriptor.c

@@ -336 +336 @@
                                 usb_hid_report_description_t, link);
 
-                if((report_des->report_id == report_id) && 
+                // if report id not set, return the first of the type
+                if(((report_des->report_id == report_id) || (report_id == 0)) && 
                    (report_des->type == type)) { 
                         return report_des;

uspace/lib/usbhid/src/hidpath.c

@@ -211 +211 @@
 
         if(report_path->report_id != path->report_id) {
-                return 1;
+                if(path->report_id != 0) {
+                        return 1;
+                }
         }