Changeset 681f24b3 in mainline

Timestamp:

2011-04-15T16:52:45Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

dc9f122

Parents:

175ad13e

Message:

usb_hid_report_path_t link fix

Location:

uspace/lib/usb

Files:

• include/usb/classes/hidparser.h (modified) (1 diff)
• src/hidparser.c (modified) (6 diffs)

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

@@ -102 +102 @@
         
         /** */  
-        link_t link;
+        link_t link; /* list */
+
+        link_t head; /* head of list of usage paths */
 
 } usb_hid_report_path_t;

uspace/lib/usb/src/hidparser.c

@@ -39 +39 @@
 #include <mem.h>
 #include <usb/debug.h>
+#include <assert.h>
 
 /** The new report item flag. Used to determine when the item is completly
@@ -139 +140 @@
         if(path_it == &report->collection_paths) {
                 path = usb_hid_report_path_clone(report_item->usage_path);                      
-
-                usb_log_debug("PUVODNI: \n");
+                list_initialize(&path->link);
+
+                list_append(&path->link, &report->collection_paths);                                    
+                
                 usb_hid_print_usage_path (report_item->usage_path);
-                usb_log_debug("KLON - path: \n");
-                usb_hid_print_usage_path (path);                
-                usb_log_debug("KLON - clone: \n");
-                usb_hid_print_usage_path (usb_hid_report_path_clone(report_item->usage_path));          
-
-                list_append(&path->link, &report->collection_paths);                    
-
-                // PROC SE KRUVA VLOZI NESMYSLY??
-                usb_log_debug("VLOZENO: \n");
-                usb_hid_print_usage_path (list_get_instance(report->collection_paths.prev, usb_hid_report_path_t, link));
-                usb_log_debug("\n");
+                usb_hid_print_usage_path (path);
+                usb_hid_print_usage_path(list_get_instance(report->collection_paths.prev, usb_hid_report_path_t, link));
+
+                assert(usb_hid_report_compare_usage_path (report_item->usage_path, 
+                list_get_instance(report->collection_paths.prev, 
+                                  usb_hid_report_path_t, link), 
+                        USB_HID_PATH_COMPARE_STRICT) == EOK);
+
                 report->collection_paths_count++;
         }
@@ -1135 +1135 @@
                                 }
 
-                                report_link = report_path->link.next;
-                                path_link = path->link.next;
+                                report_link = report_path->head.next;
+                                path_link = path->head.next;
                         
-                                while((report_link != &report_path->link) && (path_link != &path->link)) {
+                                while((report_link != &report_path->head) && (path_link != &path->head)) {
                                         report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link);
                                         path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link);            
@@ -1152 +1152 @@
                                 }
 
-                                if((report_link == &report_path->link) && (path_link == &path->link)) {
+                                if((report_link == &report_path->head) && (path_link == &path->head)) {
                                         return EOK;
                                 }
@@ -1162 +1162 @@
                 /* compare with only the end of path*/
                 case USB_HID_PATH_COMPARE_END:
-                                report_link = report_path->link.prev;
-                                path_link = path->link.prev;
-
-                                if(list_empty(&path->link)){
+                                report_link = report_path->head.prev;
+                                path_link = path->head.prev;
+
+                                if(list_empty(&path->head)){
                                         return EOK;
                                 }
                         
-                                while((report_link != &report_path->link) && (path_link != &path->link)) {
+                                while((report_link != &report_path->head) && (path_link != &path->head)) {
                                         report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link);
                                         path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link);            
@@ -1183 +1183 @@
                                 }
 
-                                if(path_link == &path->link) {
+                                if(path_link == &path->head) {
                                         return EOK;
                                 }