Changeset f3f9733 in mainline

Timestamp:

2011-05-30T14:35:40Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1aba480, 2176ed6

Parents:

b9e3aa3

Message:

Modified subdriver matching with report IDs

File:

• uspace/drv/usbhid/usbhid.c (modified) (2 diffs)

uspace/drv/usbhid/usbhid.c

@@ -206 +206 @@
         }
         
-        if (mapping->report_id >= 0) {
-                usb_hid_report_path_set_report_id(usage_path, 
-                    mapping->report_id);
-        }
+//      if (mapping->report_id >= 0) {
+//              usb_hid_report_path_set_report_id(usage_path, 
+//                  mapping->report_id);
+//      }
         
         assert(hid_dev->report != NULL);
@@ -216 +216 @@
 //      size_t size = usb_hid_report_size(hid_dev->report, 0, 
 //          USB_HID_REPORT_TYPE_INPUT);
-        size_t size = 0;
-
-        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)) {
+//      size_t size = 0;
+        
+        bool matches = false;
+
+//      usb_hid_report_description_t *report_des = 
+//              usb_hid_report_find_description(hid_dev->report,
+//              mapping->report_id, USB_HID_REPORT_TYPE_INPUT);
+        uint8_t report_id = mapping->report_id;
+
+        /*while(report_des != NULL)*/do {
+
+//              if((mapping->report_id) == 0 && (report_des->report_id != 0)) {
+//                      usb_hid_report_path_set_report_id(usage_path,
+//                              report_des->report_id);
+//              }
+                                             
+                usb_log_debug("Trying report id %u\n", report_id);
+                
+                if (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 {
+                                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);
+                
+                usb_log_debug("Field: %p\n", field);
+
+                if (field != NULL) {
+//                      size++;
+//                      field = usb_hid_report_get_sibling(hid_dev->report,
+//                          field, usage_path, mapping->compare, 
+//                          USB_HID_REPORT_TYPE_INPUT);
+                        matches = true;
                         break;
                 }
-        }
-        
-        usb_log_debug("Size of the input report: %zu\n", size);
+                
+                report_id = usb_hid_get_next_report_id(
+                    hid_dev->report, report_id,
+                    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;
+//              }
+        } while (!matches && report_id != 0);
+        
+//      usb_log_debug("Size of the input report: %zu\n", size);
         usb_hid_report_path_free(usage_path);
         
-        return (size > 0);
+        return matches;
 }