sam3n: fix confusion between interrupt numbers and peripheral ids.

[bertos.git] / bertos / cfg / compiler.h

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index 3426cd06e0bae5733a6eb114f3331fd5d7f8eaa8..0121b96367fe067cc98ba9a92004356c05ef56a5 100644 (file)
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -82,7 +82,9 @@
 
        /**
         * usage:
+        * \code
         * #define foo_init(...) PP_CAT(foo_init_, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+        * \endcode
         */
 
 #else
@@ -92,7 +94,9 @@
 
        /**
         * usage:
+        * \code
         * #define foo_init(args...) PP_CAT(foo_init_, COUNT_PARMS(args)) (args)
+        * \endcode
         */
 
 #endif
@@ -205,6 +209,7 @@
        #define RESTRICT                __restrict__
        #define MUST_CHECK              __attribute__((warn_unused_result))
        #define PACKED                  __attribute__((packed))
+       #define ALIGNED(x)              __attribute__ ((__aligned__(x)))
        #if CPU_ARM | CPU_CM3
                #define NAKED           __attribute__((naked))
        #else
@@ -356,6 +361,9 @@
 #ifndef PACKED
 #define PACKED                 /* nothing */
 #endif
+#ifndef ALIGNED
+#define ALIGNED                /* nothing */
+#endif
 #ifndef MEMORY_BARRIER
 #define MEMORY_BARRIER         /* nothing */
 #warning No memory barrier defined for select compiler. If you use the kernel check it.
@@ -482,8 +490,8 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
                typedef long ssize_t;
        #elif CPU_ARM || CPU_CM3
                typedef int ssize_t;
-       #elif CPU_AVR
-               /* 16bit (missing in avr-libc's sys/types.h). */
+       #elif CPU_AVR || CPU_MSP430
+               /* 16bit (missing in avr-/msp430-libc's sys/types.h). */
                typedef int ssize_t;
        #else
                #error Unknown CPU
@@ -527,7 +535,22 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
         *
         * \note This macro is non-standard, but implements a very common idiom
         */
-       #define countof(a)  (sizeof(a) / sizeof(*(a)))
+       #if defined(__GNUC__) && !defined(__cplusplus)
+               /*
+                * Perform a compile time type checking: countof() can only
+                * work with static arrays, so throw a compile time error if a
+                * pointer is passed as argument.
+                *
+                * NOTE: the construct __builtin_types_compatible_p() is only
+                * available for C.
+                */
+               #define countof(a) (sizeof(a) / sizeof(*(a)) +          \
+                               STATIC_ASSERT_EXPR(                     \
+                                       !__builtin_types_compatible_p(  \
+                                               typeof(a), typeof(&a[0]))))
+       #else
+               #define countof(a)  (sizeof(a) / sizeof(*(a)))
+       #endif
 #endif
 #ifndef alignof
        /**
@@ -561,6 +584,13 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 #define STATIC_ASSERT(condition)  \
        UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
 
+/**
+ * Issue a compilation error if \a __cond is false (this can be used inside an
+ * expression).
+ */
+#define STATIC_ASSERT_EXPR(__cond) \
+       (sizeof(struct { int STATIC_ASSERTION_FAILED__:!!(__cond); }) * 0)
+
 #ifndef ASSERT_TYPE_EQUAL
        /** Ensure two variables have the same type. */
        #define ASSERT_TYPE_EQUAL(var1, var2)  \