Changeset 662da50 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-06-16T10:21:33Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d022500

Parents:

854eddd6 (diff), bbfa425 (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 last-minute USB changes

File:

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

uspace/drv/usbhid/usbhid.c

@@ -582 +582 @@
         }
         
+        // 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 +598 @@
                 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/*, buffer, buffer_size*/)) {
                         cont = true;
                 }