X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fmacros.h;h=a017457e2d7e2bebbf8f67c0aac87cee395f693b;hb=3b33848a29f6a9ba49a2913ba6b721e01d8b95f5;hp=d33ee401ef5cc0010e528363d34d952e92b597d6;hpb=8c8d2df610762e52e41e7d6f94f0d1c185841ae8;p=bertos.git

diff --git a/cfg/macros.h b/cfg/macros.h
index d33ee401..a017457e 100755
--- a/cfg/macros.h
+++ b/cfg/macros.h
@@ -2,7 +2,7 @@
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Common and handy function macros
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/03/13 02:06:55  bernie
+ *#* ROUND_UP2: Rename from ROUND2.
+ *#*
+ *#* Revision 1.7  2006/02/20 14:34:58  bernie
+ *#* Use portable type checking.
+ *#*
+ *#* Revision 1.6  2006/02/10 12:36:57  bernie
+ *#* Pacify IAR warnings for side-effects.
+ *#*
+ *#* Revision 1.5  2005/11/04 16:20:01  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.4  2005/07/03 15:19:09  bernie
+ *#* Doxygen fix.
+ *#*
  *#* Revision 1.3  2005/06/27 21:23:32  bernie
  *#* ROUND_DOWN, ROUND_UP, ROUND_NEAREST: New macros.
  *#*
@@ -93,13 +108,13 @@
 	#define MIN(a,b) ({ \
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
+		ASSERT_TYPE_EQUAL(_a, _b); \
 		(_a < _b) ? _a : _b; \
 	})
 	#define MAX(a,b) ({ \
 		typeof(a) _a = (a); \
 		typeof(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
+		ASSERT_TYPE_EQUAL(_a, _b); \
 		(_a > _b) ? _a : _b; \
 	})
 #else /* !(COMPILER_STATEMENT_EXPRESSIONS && COMPILER_TYPEOF) */
@@ -123,15 +138,21 @@
 	 */
 	#define SWAP(a, b) \
 		do { \
-			(void)(&(a) == &(b)); /* type check */ \
 			typeof(a) tmp; \
+			ASSERT_TYPE_EQUAL(a, b); \
 			tmp = (a); \
 			(a) = (b); \
 			(b) = tmp; \
 		} while (0)
 #else /* !COMPILER_TYPEOF */
 	/* Sub-optimal implementation that only works with integral types. */
-	#define SWAP(a, b) ((a) ^= (b) ^= (a) ^= (b))
+	#define SWAP(a, b) \
+		do { \
+			(a) ^= (b); \
+			(b) ^= (a); \
+			(a) ^= (b); \
+		} while (0)
+
 #endif /* COMPILER_TYPEOF */
 
 #ifndef BV
@@ -139,11 +160,15 @@
 	#define BV(x)  (1<<(x))
 #endif
 
-/*! Round up \a x to an even multiple of the 2's power \a pad */
-#define ROUND2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
+/** 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
 
 /*!
- * Integer round macros.
+ * \name Integer round macros.
+ *
  * Round \a x to a multiple of \a base.
  * \note If \a x is signed these macros generate a lot of code.
  * \{
@@ -153,7 +178,7 @@
 #define ROUND_NEAREST(x, base) ( ((x) + (base) / 2) - (((x) + (base) / 2) % (base)) )
 /* \} */
 
-//! Check if \a x is an integer power of 2
+/** Check if \a x is an integer power of 2. */
 #define IS_POW2(x)     (!(bool)((x) & ((x)-1)))
 
 /*! Calculate a compile-time log2 for a uint8_t */