Changeset 8b863a62 in mainline for uspace/lib/usbhid/src/hidpath.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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:

Merge mainline changes

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (5 diffs)

uspace/lib/usbhid/src/hidpath.c

@@ -176 +176 @@
         usb_log_debug("\tLENGTH: %d\n", path->depth);
 
-        usb_hid_report_usage_path_t *path_item;
-
-        list_foreach(path->items, item) {
-                path_item = list_get_instance(item, usb_hid_report_usage_path_t,
-                        rpath_items_link);
+        list_foreach(path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page);
@@ -237 +234 @@
                         usb_hid_report_usage_path_t, rpath_items_link);
 
-                list_foreach(report_path->items, report_link) {
-                        report_item = list_get_instance(report_link,
-                                usb_hid_report_usage_path_t, rpath_items_link);
+                list_foreach(report_path->items, rpath_items_link,
+                    usb_hid_report_usage_path_t, report_item) {
+
+                        if (USB_HID_SAME_USAGE_PAGE(report_item->usage_page,
+                                path_item->usage_page)) {
                                 
-                        if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page,
-                                path_item->usage_page)){
-                                        
-                                if(only_page == 0){
-                                        if(USB_HID_SAME_USAGE(
-                                                report_item->usage,
-                                                path_item->usage)) {
-                                                        
+                                if (only_page == 0) {
+                                        if (USB_HID_SAME_USAGE(report_item->usage,
+                                            path_item->usage))
                                                 return EOK;
-                                        }
                                 }
                                 else {
@@ -266 +259 @@
                         return 1;
                 }
-                
+
         /* path is prefix of the report_path */
         case USB_HID_PATH_COMPARE_BEGIN:
-        
+
                 report_link = report_path->items.head.next;
                 path_link = path->items.head.next;
+                
+                while ((report_link != &report_path->items.head) &&
+                    (path_link != &path->items.head)) {
                         
-                while((report_link != &report_path->items.head) && 
-                      (path_link != &path->items.head)) {
-                                          
                         report_item = list_get_instance(report_link, 
-                                usb_hid_report_usage_path_t, rpath_items_link);
-                                          
+                            usb_hid_report_usage_path_t, rpath_items_link);
+                        
                         path_item = list_get_instance(path_link,
                                 usb_hid_report_usage_path_t, rpath_items_link);
 
-                        if(!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 
-                                path_item->usage_page) || ((only_page == 0) && 
+                        if (!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 
+                            path_item->usage_page) || ((only_page == 0) && 
                             !USB_HID_SAME_USAGE(report_item->usage, 
-                                path_item->usage))) {
-                        
+                            path_item->usage))) {
                                 return 1;
-                        } 
-                        else {
+                        } else {
                                 report_link = report_link->next;
-                                path_link = path_link->next;                    
+                                path_link = path_link->next;
                         }
-                        
-                }
-
-                if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
-                        (path_link == &path->items.head)) || 
-                   ((report_link == &report_path->items.head) && 
-                        (path_link == &path->items.head))) {
-                                
+                }
+
+                if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
+                    (path_link == &path->items.head)) || 
+                    ((report_link == &report_path->items.head) && 
+                    (path_link == &path->items.head))) {
                         return EOK;
-                }
-                else {
+                } else {
                         return 1;
-                }                                               
+                }
                 break;
 
@@ -405 +393 @@
         usb_hid_report_path_t *usage_path)
 {
-        usb_hid_report_usage_path_t *path_item;
         usb_hid_report_usage_path_t *new_path_item;
         usb_hid_report_path_t *new_usage_path = usb_hid_report_path ();
@@ -419 +406 @@
         }
 
-        list_foreach(usage_path->items, path_link) {
-                path_item = list_get_instance(path_link,
-                        usb_hid_report_usage_path_t, rpath_items_link);
+        list_foreach(usage_path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t));