Changeset ee820ff in mainline for kernel/generic/include/macros.h

Timestamp:

2018-02-22T19:39:53Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

0539c14

Parents:

5fe3f954 (diff), df368491 (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 commit 'df368491aa1c0ce3024a51c602b7d0cbe4bd84d3'

File:

• kernel/generic/include/macros.h (modified) (5 diffs)

kernel/generic/include/macros.h

@@ -62 +62 @@
         if (sz2)
                 return ((s1 >= s2) && (s1 <= e2));
+        
         if (sz1)
                 return ((s2 >= s1) && (s2 <= e1));
@@ -86 +87 @@
         if (sz1 == 0)
                 return (s1 == s2) && (sz2 == 0);
-        e1 = s1 + sz1 - 1;      
+        
+        e1 = s1 + sz1 - 1;
         if (sz2 == 0)
                 return (s1 <= s2) && (s2 <= e1);
+        
         e2 = s2 + sz2 - 1;
 
@@ -97 +100 @@
 #endif /* __ASM__ */
 
-#define ispwr2(x)       (((x) & ((x) - 1)) == 0)
+#define ispwr2(x)  (((x) & ((x) - 1)) == 0)
 
 #define isdigit(d)     (((d) >= '0') && ((d) <= '9'))
@@ -142 +145 @@
 
 /* Test for sum overflow into positive numbers. */
-#define overflows_into_positive(a, b)   \
+#define overflows_into_positive(a, b) \
         (overflows((a), (b)) && ((a) + (b) > 0))
 
@@ -157 +160 @@
         })
 
-
-#ifndef member_to_inst
 #define member_to_inst(ptr_member, type, member_identif) \
-        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
-#endif
-
+        ((type *) (((void *) (ptr_member)) - \
+            ((void *) &(((type *) 0)->member_identif))))
 
 #endif