X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fmacros.h;h=3ec6b277e51f320f87937098c1a88094ce965a1d;hb=bfe473a7e8951b16edbd6559b828a37e6ce378aa;hp=dda5fe0e635a023bfc1c3cb338b9d65d0a09ff8d;hpb=e2859fe4c9165cbb9cf2302945d2b51b0540a0bb;p=bertos.git

diff --git a/bertos/cfg/macros.h b/bertos/cfg/macros.h
index dda5fe0e..3ec6b277 100644
--- a/bertos/cfg/macros.h
+++ b/bertos/cfg/macros.h
@@ -32,8 +32,7 @@
  *
  * \brief Common and handy function macros
  *
- * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Giovanni Bajo <rasky@develer.com>
  */
 #ifndef CFG_MACROS_H
@@ -95,6 +94,11 @@
 	#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
 #endif /* !(COMPILER_STATEMENT_EXPRESSIONS && COMPILER_TYPEOF) */
 
+/** Align \p value to the next \p align boundary */
+#define ALIGN_UP(value, align)	(((value) & ((align) - 1)) ? \
+				(((value) + ((align) - 1)) & ~((align) - 1)) : \
+				(value))
+
 /** Bound \a x between \a min and \a max. */
 #define MINMAX(min,x,max)  (MIN(MAX(min, x), max))
 
@@ -126,6 +130,19 @@
 
 #endif /* COMPILER_TYPEOF */
 
+/**
+ * Shuffle the content of \a array that counts \a len elements.
+ */
+#define SHUFFLE(array, len) \
+	do { \
+		int i, j; \
+		for (i = (len) - 1; i > 0; i--) \
+		{ \
+			j = ((i + 1) * (rand() / (RAND_MAX + 1.0))); \
+			SWAP((array)[i], (array)[j]); \
+		} \
+	} while (0)
+
 /**
  * Macro to swap \a a with \a b, with explicit type \a T for dumb C89 compilers.
  *
@@ -141,6 +158,12 @@
 		(b) = tmp; \
 	} while (0)
 
+/**
+ * Reverse the bits contained in b (LSB becomes the MSB and so on).
+ * \note \a b is evaluated twice
+ */
+#define REVERSE_UINT8(b) \
+	((uint8_t)((((b) * 0x0802UL & 0x22110UL) | ((b) * 0x8020UL & 0x88440UL)) * 0x10101UL >> 16))
 
 #ifndef BV
 	/** Convert a bit value to a binary flag. */
@@ -163,12 +186,16 @@
  */
 #define DIV_ROUND(dividend, divisor)  (((dividend) + (divisor) / 2) / (divisor))
 
+/**
+ * Perform an integer division rounding the result to the upper int value.
+ * \note \a divisor should preferibly be a costant, otherwise this macro generates
+ * 2 division. Also divisor is evaluated twice.
+ */
+#define DIV_ROUNDUP(dividend, divisor)  (((dividend) + (divisor) - 1) / (divisor))
+
 /** Round up \a x to an even multiple of the 2's power \a pad. */
 #define ROUND_UP2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
 
-/* OBSOLETE */
-#define ROUND2 ROUND_UP2
-
 /**
  * \name Integer round macros.
  *
@@ -263,11 +290,11 @@
 
 	#define BIT_MASK_SINGLE__(use_bv, index, max, arg) \
 		((index < max) ? (PP_CAT(BIT_EXTRACT_FLAG_, use_bv) arg) : 0) \
-		/**/
+		/* */
 
 	#define BIT_MASK_IF_SINGLE__(use_bv, index, max, arg) \
 		(((index < max) && (BIT_EXTRACT_VALUE__ arg)) ? (PP_CAT(BIT_EXTRACT_FLAG_, use_bv) arg) : 0) \
-		/**/
+		/* */
 
 	#define BIT_ITER__2(macro, use_bv, max, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15, ...) \
 		(macro(use_bv, 0, max, a0) | \
@@ -286,23 +313,23 @@
 		macro(use_bv, 13, max, a13) | \
 		macro(use_bv, 14, max, a14) | \
 		macro(use_bv, 15, max, a15)) \
-		/**/
+		/* */
 
 	#define BIT_ITER__(macro, use_bv, ...) \
 		BIT_ITER__2(macro, use_bv, PP_COUNT(__VA_ARGS__), __VA_ARGS__, (0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1)) \
-		/**/
+		/* */
 
 	#define BIT_MASKS__(use_bv, ...) \
 		BIT_ITER__(BIT_MASK_SINGLE__, use_bv, __VA_ARGS__)
-		/**/
+		/* */
 
 	#define BIT_MASKS_CONDITIONAL__(use_bv, ...) \
 		BIT_ITER__(BIT_MASK_IF_SINGLE__, use_bv, __VA_ARGS__)
-		/**/
+		/* */
 
 	#define BIT_CHANGE__(reg, use_bv, ...) \
 		((reg) = ((reg) & ~BIT_MASKS__(use_bv, __VA_ARGS__)) | BIT_MASKS_CONDITIONAL__(use_bv, __VA_ARGS__)) \
-		/**/
+		/* */
 
 	#define BIT_CHANGE(reg, ...)        BIT_CHANGE__(reg, 0, __VA_ARGS__)
 	#define BIT_CHANGE_BV(reg, ...)     BIT_CHANGE__(reg, 1, __VA_ARGS__)