Changeset b9d7965 in mainline

Timestamp:

2011-05-06T07:45:35Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

acdbd780

Parents:

1519b91

Message:

#209 - correct usage paths for decomposed items, bug fix

Location:

uspace/lib/usb

Files:

• include/usb/classes/hiddescriptor.h (modified) (1 diff)
• src/hiddescriptor.c (modified) (5 diffs)

uspace/lib/usb/include/usb/classes/hiddescriptor.h

@@ -78 +78 @@
 uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size);
 
-void usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);
+usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);
 #endif
 /**

uspace/lib/usb/src/hiddescriptor.c

@@ -56 +56 @@
 #define USB_HID_UNKNOWN_TAG             -99
 
-void usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path)
+usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path)
 {
         /* find or append current collection path to the list */
@@ -73 +73 @@
                 list_append(&path->link, &report->collection_paths);                                    
                 report->collection_paths_count++;
+
+                return path;
+        }
+        else {
+                return list_get_instance(path_it, usb_hid_report_path_t, link);
         }
 }
@@ -113 +118 @@
 
                 /* fill the attributes */               
-                field->collection_path = path;
                 field->logical_minimum = report_item->logical_minimum;
                 field->logical_maximum = report_item->logical_maximum;
@@ -172 +176 @@
                 usb_hid_report_set_last_item(path, USB_HID_TAG_CLASS_LOCAL, field->usage);
 
-                usb_hid_report_path_try_insert(report, path);
+                field->collection_path = usb_hid_report_path_try_insert(report, path);
 
                 field->size = report_item->size;
@@ -647 +651 @@
                 usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage);
                 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page);
-                                                
-//              usb_log_debug("\n");            
+                
+                //usb_hid_print_usage_path(report_item->collection_path);
+
+                usb_log_debug("\n");            
 
         }