Changeset b9e3aa3 in mainline for uspace/drv/usbhid

Timestamp:

2011-05-30T14:13:53Z (15 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)

Location:

uspace/drv/usbhid

Files:

• generic/hiddev.c (modified) (2 diffs)
• kbd/kbddev.c (modified) (1 diff)
• multimedia/multimedia.c (modified) (1 diff)
• usbhid.c (modified) (1 diff)

uspace/drv/usbhid/generic/hiddev.c

@@ -99 +99 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
         
-        usb_log_debug2("hid_dev: %p, Max input report size (%d).\n",
+        usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n",
             hid_dev, hid_dev->max_input_report_size);
         
@@ -226 +226 @@
         }
         
-        usb_log_debug("HID function created. Handle: %d\n", fun->handle);
+        usb_log_debug("HID function created. Handle: %" PRIun "\n", fun->handle);
         
         return EOK;

uspace/drv/usbhid/kbd/kbddev.c

@@ -798 +798 @@
         }
         
-        usb_log_debug("%s function created. Handle: %d\n", HID_KBD_FUN_NAME,
-            fun->handle);
+        usb_log_debug("%s function created. Handle: %" PRIun "\n",
+            HID_KBD_FUN_NAME, fun->handle);
         
         usb_log_debug("Adding DDF function to class %s...\n", 

uspace/drv/usbhid/multimedia/multimedia.c

@@ -211 +211 @@
         }
         
-        usb_log_debug("%s function created. Handle: %d\n", NAME, fun->handle);
+        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
+            NAME, fun->handle);
         
         rc = ddf_fun_add_to_class(fun, "keyboard");

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;
+                }
         }