Changes in uspace/lib/usb/src/hidpath.c [5f7b75a:9d05599] in mainline

File:

• uspace/lib/usb/src/hidpath.c (modified) (6 diffs)

uspace/lib/usb/src/hidpath.c

@@ -149 +149 @@
                 usb_log_debug("\tFLAGS: %d\n", path_item->flags);               
                 
-                item = item->next;
+                item = item->next;
         }
 }
@@ -156 +156 @@
  * Compares two usage paths structures
  *
- *
- * @param report_path usage path structure to compare with @path 
+ * If USB_HID_PATH_COMPARE_COLLECTION_ONLY flag is given, the last item in report_path structure is forgotten
+ *
+ * @param report_path usage path structure to compare
  * @param path usage patrh structure to compare
  * @param flags Flags determining the mode of comparison
@@ -178 +179 @@
         }
 
-        // Empty path match all others
         if(path->depth == 0){
                 return EOK;
@@ -189 +189 @@
         
         switch(flags){
-                /* path is somewhere in report_path */
-                case USB_HID_PATH_COMPARE_ANYWHERE:
-                        if(path->depth != 1){
-                                return 1;
-                        }
-
-                        // projit skrz cestu a kdyz nekde sedi tak vratim EOK
-                        // dojduli az za konec tak nnesedi
-                        report_link = report_path->head.next;
-                        path_link = path->head.next;
-                        path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, link);
-
-                        while(report_link != &report_path->head) {
-                                report_item = list_get_instance(report_link, usb_hid_report_usage_path_t, link);
-                                if(report_item->usage_page == path_item->usage_page){
-                                        if(only_page == 0){
-                                                if(report_item->usage == path_item->usage) {
-                                                        return EOK;
-                                                }
-                                        }
-                                        else {
-                                                return EOK;
-                                        }
-                                }
-
-                                report_link = report_link->next;
-                        }
-
-                        return 1;
-                        break;
-                /* the paths must be identical */
+                /* path must be completly identical */
                 case USB_HID_PATH_COMPARE_STRICT:
                                 if(report_path->depth != path->depth){
                                         return 1;
                                 }
-                
-                /* path is prefix of the report_path */
-                case USB_HID_PATH_COMPARE_BEGIN:
-        
+
                                 report_link = report_path->head.next;
                                 path_link = path->head.next;
@@ -254 +221 @@
                                 }
 
-                                if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && (path_link == &path->head)) || 
-                                   ((report_link == &report_path->head) && (path_link == &path->head))) {
+                                if(((report_link == &report_path->head) && (path_link == &path->head)) || 
+                                   (((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) && 
+                                    (path_link = &path->head) && 
+                                    (report_link == report_path->head.prev))) {
                                         return EOK;
                                 }
@@ -263 +232 @@
                         break;
 
-                /* path is suffix of report_path */
+                /* compare with only the end of path*/
                 case USB_HID_PATH_COMPARE_END:
 
-                                report_link = report_path->head.prev;
+                                if((flags & USB_HID_PATH_COMPARE_COLLECTION_ONLY) != 0) {
+                                        report_link = report_path->head.prev->prev;
+                                }
+                                else {
+                                        report_link = report_path->head.prev;
+                                }
                                 path_link = path->head.prev;