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

Timestamp:

2011-05-26T20:43:26Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

d861c22

Parents:

14e1bcc

Message:

doxygen and coding style update

File:

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

uspace/lib/usbhid/src/hidpath.c

@@ -225 +225 @@
         
         switch(flags){
-                /* path is somewhere in report_path */
-                case USB_HID_PATH_COMPARE_ANYWHERE:
-                        if(path->depth != 1){
-                                return 1;
-                        }
-
-                        report_link = report_path->head.next;
-                        path_link = path->head.next;
-                        path_item = list_get_instance(path_link, 
+        /* path is somewhere in report_path */
+        case USB_HID_PATH_COMPARE_ANYWHERE:
+                if(path->depth != 1){
+                        return 1;
+                }
+
+                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);
-
-                        while(report_link != &report_path->head) {
-                                report_item = list_get_instance(report_link, 
-                                        usb_hid_report_usage_path_t, link);
                                 
-                                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 {
                                                 return EOK;
                                         }
                                 }
-
+                                else {
+                                        return EOK;
+                                }
+                        }
+
+                        report_link = report_link->next;
+                }
+
+                return 1;
+                break;
+
+        /* the paths must be 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;
+                        
+                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);
+
+                        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))) {
+                        
+                                return 1;
+                        } 
+                        else {
                                 report_link = report_link->next;
+                                path_link = path_link->next;                    
                         }
-
-                        return 1;
-                        break;
-                /* the paths must be 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;
-                        
-                                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);             
-
-                                        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))) {
-                                                        
-                                                   return 1;
-                                        } else {
-                                                report_link = report_link->next;
-                                                path_link = path_link->next;                    
-                                        }
                         
                                 }
 
-                                if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
-                                        (path_link == &path->head)) || 
-                                   ((report_link == &report_path->head) && 
-                                        (path_link == &path->head))) {
-                                        
-                                        return EOK;
-                                }
-                                else {
+                if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
+                        (path_link == &path->head)) || 
+                   ((report_link == &report_path->head) && 
+                        (path_link == &path->head))) {
+                                
+                        return EOK;
+                }
+                else {
+                        return 1;
+                }                                               
+                break;
+
+        /* path is suffix of report_path */
+        case USB_HID_PATH_COMPARE_END:
+
+                report_link = report_path->head.prev;
+                path_link = path->head.prev;
+
+                if(list_empty(&path->head)){
+                        return EOK;
+                }
+                        
+                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);             
+                                                  
+                        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))) {
+                                                
                                         return 1;
-                                }                                               
-                        break;
-
-                /* path is suffix of report_path */
-                case USB_HID_PATH_COMPARE_END:
-
-                                report_link = report_path->head.prev;
-                                path_link = path->head.prev;
-
-                                if(list_empty(&path->head)){
-                                        return EOK;
-                                }
+                        } else {
+                                report_link = report_link->prev;
+                                path_link = path_link->prev;                    
+                        }
+
+                }
+
+                if(path_link == &path->head) {
+                        return EOK;
+                }
+                else {
+                        return 1;
+                }                                               
                         
-                                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);             
-                                                  
-                                        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))) {
-                                                
-                                                        return 1;
-                                        } else {
-                                                report_link = report_link->prev;
-                                                path_link = path_link->prev;                    
-                                        }
-                        
-                                }
-
-                                if(path_link == &path->head) {
-                                        return EOK;
-                                }
-                                else {
-                                        return 1;
-                                }                                               
-                        
-                        break;
-
-                default:
-                        return EINVAL;
+                break;
+
+        default:
+                return EINVAL;
         }
 }
@@ -418 +421 @@
         path_link = usage_path->head.next;
         while(path_link != &usage_path->head) {
-                path_item = list_get_instance(path_link, usb_hid_report_usage_path_t,
-                                              link);
+                path_item = list_get_instance(path_link, 
+                        usb_hid_report_usage_path_t, link);
+
                 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t));
                 if(new_path_item == NULL) {