Changeset 07525cd in mainline

Timestamp:

2013-09-10T18:34:16Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bc23d

Parents:

85147f3

Message:

cstyle

Files:

• kernel/generic/include/adt/list.h (modified) (1 diff)
• uspace/lib/c/include/adt/list.h (modified) (4 diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (11 diffs)
• uspace/lib/usbhid/src/hidpath.c (modified) (3 diffs)

kernel/generic/include/adt/list.h

@@ -68 +68 @@
 
 #define list_foreach(list, member, itype, iterator) \
-        for (itype *iterator = NULL; iterator == NULL; iterator =(itype *)1) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
             for (link_t *_link = (list).head.next; \
             iterator = list_get_instance(_link, itype, member), \

uspace/lib/c/include/adt/list.h

@@ -68 +68 @@
 
 #define list_foreach(list, member, itype, iterator) \
-        for (itype *iterator = NULL; iterator == NULL; iterator =(itype *)1) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
             for (link_t *_link = (list).head.next; \
             iterator = list_get_instance(_link, itype, member), \
@@ -74 +74 @@
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
- * 
+ *
  * @code
  * list_t mylist;
@@ -249 +249 @@
  *
  * @return Next item or NULL if @a link is the last item.
+ *
  */
 static inline link_t *list_next(link_t *link, const list_t *list)
@@ -261 +262 @@
  *
  * @return Previous item or NULL if @a link is the first item.
+ *
  */
 static inline link_t *list_prev(link_t *link, const list_t *list)

uspace/lib/usbhid/src/hidparser.c

@@ -132 +132 @@
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
-
+        
         if (report == NULL) {
                 return EINVAL;
@@ -155 +155 @@
 
                 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
-
+                        
                         if (USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) {
                                 /* array */
                                 item->value = 
                                         usb_hid_translate_data(item, data);
-
+                                
                                 item->usage = USB_HID_EXTENDED_USAGE(
                                     item->usages[item->value -
@@ -185 +185 @@
                 }
         }
-
+        
         return EOK;
 }
@@ -340 +340 @@
         int length;
         int32_t tmp_value;
-
+        
         if (report == NULL) {
                 return EINVAL;
@@ -352 +352 @@
         report_des = usb_hid_report_find_description(report, report_id, 
             USB_HID_REPORT_TYPE_OUTPUT);
-
+        
         if (report_des == NULL) {
                 return EINVAL;
@@ -364 +364 @@
                 offset = report_des->bit_length - report_item->offset - 1;
                 length = report_item->size;
-
+                
                 usb_log_debug("\ttranslated value: %x\n", value);
 
@@ -375 +375 @@
                         value = value << shift;
                         value = value & (((1 << length) - 1) << shift);
-
+                        
                         uint8_t mask = 0;
                         mask = 0xff - (((1 << length) - 1) << shift);
@@ -391 +391 @@
 
                                         tmp_value = tmp_value << (offset % 8);
-
+                                        
                                         mask = ~(((1 << (8 - (offset % 8))) - 1)
                                             << (offset % 8));
@@ -398 +398 @@
                                             tmp_value;
                                 } else if (i == ((offset + length - 1) / 8)) {
-
+                                        
                                         value = value >> (length - 
                                             ((offset + length) % 8));
@@ -404 +404 @@
                                         value = value & ((1 << (length - 
                                             ((offset + length) % 8))) - 1);
-
+                                        
                                         mask = (1 << (length - 
                                             ((offset + length) % 8))) - 1;
@@ -418 +418 @@
                 report_item->value = 0;
         }
-
+        
         return EOK;
 }

uspace/lib/usbhid/src/hidpath.c

@@ -237 +237 @@
                     usb_hid_report_usage_path_t, report_item) {
 
-                        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 (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))
                                                 return EOK;
-                                        }
                                 }
                                 else {
@@ -268 +265 @@
                 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 {
@@ -290 +286 @@
                 }
 
-                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;