Changeset f1fae414 in mainline for uspace/drv/bus/usb/usbhid/usbhid.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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:

Merge mainline changes.

File:

• uspace/drv/bus/usb/usbhid/usbhid.c (moved) (moved from uspace/drv/usbhid/usbhid.c ) (3 diffs)

uspace/drv/bus/usb/usbhid/usbhid.c

@@ -572 +572 @@
         
         assert(hid_dev->input_report != NULL);
-        usb_log_debug("Max input report size: %zu, buffer size: %zu\n",
-            hid_dev->max_input_report_size, buffer_size);
+        usb_log_debug("New data [%zu/%zu]: %s\n", buffer_size,
+            hid_dev->max_input_report_size,
+            usb_debug_str_buffer(buffer, buffer_size, 0));
 
         if (hid_dev->max_input_report_size >= buffer_size) {
@@ -582 +583 @@
         }
         
+        // parse the input report
+        
+        int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
+            &hid_dev->report_id);
+        
+        if (rc != EOK) {
+                usb_log_warning("Error in usb_hid_parse_report():"
+                    "%s\n", str_error(rc));
+        }       
+        
         bool cont = false;
         
@@ -588 +599 @@
                 if (hid_dev->subdrivers[i].poll != NULL
                     && hid_dev->subdrivers[i].poll(hid_dev, 
-                        hid_dev->subdrivers[i].data, buffer, buffer_size)) {
+                        hid_dev->subdrivers[i].data)) {
                         cont = true;
                 }