Changeset 8357fc9 in mainline for uspace/lib/usbhid

Timestamp:

2011-05-30T14:07:57Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

b9e3aa3, f9a627a

Parents:

118d38d (diff), dcb7d7cd (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:

MS mouse works

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (1 diff)
• hidpath.c (modified) (1 diff)

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