X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=macros.h;h=53ce9a74903e9b496f44c3ca028bc46d90c0e883;hb=0168eb0bee0da568cd3ea8f8dfffa9343175efd9;hp=8723fc1ccc36d64b846fdfbe76d9ccae689fb084;hpb=94d6b489cc031d86359c89ef1f2f0669a8bf0094;p=bertos.git

diff --git a/macros.h b/macros.h
index 8723fc1c..53ce9a74 100755
--- a/macros.h
+++ b/macros.h
@@ -5,16 +5,21 @@
  * This file is part of DevLib - See devlib/README for information.
  * -->
  *
- * \version $Id$
+ * \brief Common and handy function macros
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Giovanni Bajo <rasky@develer.com>
- *
- * \brief Common and handy function macros
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2004/09/20 03:30:45  bernie
+ *#* C++ also has variadic macros.
+ *#*
+ *#* Revision 1.6  2004/09/14 21:02:04  bernie
+ *#* SWAP(), MINMAX(): New macros.
+ *#*
  *#* Revision 1.5  2004/08/29 21:57:58  bernie
  *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h;
  *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.
@@ -77,6 +82,23 @@
 	#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
 #endif /* !GNUC */
 
+/*! Bound \a x between \a min and \a max */
+#define MINMAX(min,x,max)  (MIN(MAX(min, x), max))
+
+/*!
+ * Type-generic macro to swap a with b
+ *
+ * \note arguments are evaluated multiple times
+ */
+#define SWAP(a, b) \
+	do { \
+		(void)(&(a) == &(b)); /* type check */ \
+		typeof(a) tmp; \
+		tmp = (a); \
+		(a) = (b); \
+		(b) = tmp; \
+	} while (0)
+
 #ifndef BV
 /*! Convert a bit value to a binary flag */
 #define BV(x)       (1<<(x))
@@ -106,7 +128,7 @@
 #define UINT32_LOG2(x) \
 	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
 
-#if COMPILER_C99
+#if COMPILER_C99 || defined(__cplusplus)
 	/*! Count the number of arguments (up to 16) */
 	#define PP_COUNT(...) \
 		PP_COUNT__(__VA_ARGS__,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
@@ -114,7 +136,7 @@
 		count
 #endif
 
-#if COMPILER_C99
+#if COMPILER_C99 || defined(__cplusplus)
 	/*!
 	 * \def BIT_CHANGE(reg, (mask, value), ...)
 	 *