Changes in kernel/generic/include/bitops.h [7a0359b:b3f8fb7] in mainline

File:

• kernel/generic/include/bitops.h (modified) (4 diffs)

kernel/generic/include/bitops.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */
@@ -36 +36 @@
 #define KERN_BITOPS_H_
 
-#include <trace.h>
 
-#ifdef __32_BITS__
-        #define fnzb(arg)  fnzb32(arg)
-#endif
+/** Return position of first non-zero bit from left (i.e. [log_2(arg)]).
+ *
+ * If number is zero, it returns 0
+ */
+static inline int fnzb32(uint32_t arg)
+{
+        int n = 0;
 
-#ifdef __64_BITS__
-        #define fnzb(arg)  fnzb64(arg)
-#endif
-
-/** Return position of first non-zero bit from left (32b variant).
- *
- * @return 0 (if the number is zero) or [log_2(arg)].
- *
- */
-NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
-{
-        uint8_t n = 0;
-        
         if (arg >> 16) {
                 arg >>= 16;
@@ -75 +65 @@
         }
         
-        if (arg >> 1)
+        if (arg >> 1) {
+                arg >>= 1;
                 n += 1;
+        }
         
         return n;
 }
 
-/** Return position of first non-zero bit from left (64b variant).
- *
- * @return 0 (if the number is zero) or [log_2(arg)].
- *
- */
-NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
+static inline int fnzb64(uint64_t arg)
 {
-        uint8_t n = 0;
-        
+        int n = 0;
+
         if (arg >> 32) {
                 arg >>= 32;
@@ -98 +85 @@
 }
 
+#define fnzb(x) fnzb32(x)
+
 #endif