Update preset.

[bertos.git] / bertos / cpu / types.h

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index 252d77a9796764ce929bbcb46dd6b09d67b3f1a1..dcddaa59b8d6e228fd8715f42deb92e3e397dd8d 100644 (file)
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -43,6 +43,7 @@
 
 #include "detect.h"
 #include "attr.h"
+#include <limits.h>
 #include <cfg/compiler.h> /* for uintXX_t */
 
 #if CPU_I196
@@ -77,13 +78,14 @@
                #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
        #endif
 
-#elif CPU_ARM
+#elif CPU_ARM || CPU_CM3
 
        typedef uint32_t cpu_flags_t;
        typedef uint32_t cpu_atomic_t;
        typedef uint32_t cpu_stack_t;
-       typedef uint64_t cpu_aligned_stack_t;
        #define SIZEOF_CPUSTACK_T 4
+
+       typedef uint64_t cpu_aligned_stack_t;
        #define SIZEOF_CPUALIGNED_T 8
 
 #elif CPU_PPC
@@ -119,6 +121,14 @@
        #define SIZEOF_CPUSTACK_T 1
        #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
 
+#elif CPU_MSP430
+
+       typedef uint16_t cpu_flags_t;
+       typedef uint16_t cpu_stack_t;
+       typedef cpu_stack_t cpu_aligned_stack_t;
+       #define SIZEOF_CPUSTACK_T 2
+       #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
+
 #else
        #error No CPU_... defined.
 #endif
@@ -207,6 +217,11 @@
 
 /*\}*/
 
+#ifndef INT_MAX
+       #define INT_MAX ((int)((unsigned int)~0 >> 1))
+       #define INT_MIN (-INT_MAX - 1)
+#endif
+
 /* Sanity checks for the above definitions */
 STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
 STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
@@ -227,4 +242,14 @@ STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
 STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
 STATIC_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T);
 
+
+/**
+ * Macros for hardware access, both direct and via the bit-band region.
+ */
+/*\{*/
+#define HWREG(x)   (*((reg32_t *)(x)))
+#define HWREGH(x)  (*((reg16_t *)(x)))
+#define HWREGB(x)  (*((reg8_t *)(x)))
+/*\}*/
+
 #endif /* CPU_TYPES_H */