Changeset 3ae26a8 in mainline for uspace/lib/usbhid

Timestamp:

2011-05-30T17:23:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

55f324f, c060090

Parents:

17d1542 (diff), 0dd3e49 (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 branch changes

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (2 diffs)
• hidparser.c (modified) (1 diff)
• hidpath.c (modified) (1 diff)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -329 +329 @@
                 usb_hid_report_type_t type) {
 
+        if(report == NULL) {
+                return NULL;
+        }
+
         link_t *report_it = report->reports.next;
         usb_hid_report_description_t *report_des = NULL;
@@ -336 +340 @@
                                 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/hidparser.c

@@ -605 +605 @@
         
         if(report_id > 0) {
-                report_it = usb_hid_report_find_description(report, report_id, 
-                        type)->link.next;               
+                report_des = usb_hid_report_find_description(report, report_id, 
+                        type);
+                if(report_des == NULL) {
+                        return 0;
+                }
+                else {
+                        report_it = report_des->link.next;
+                }       
         }
         else {

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