X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Ftypes.h;h=ebd341718c9efdc876f8cc67b4ca4d5e654941e9;hb=a3f9ca9d86b7f8da31204746cc32e13c2dbe5ed0;hp=3e56a360f08da48b56296c0d6ee853b79de09aa6;hpb=0b38ba2ac1fe2fc44ee6b417235fdc0f42f65867;p=bertos.git

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index 3e56a360..ebd34171 100644
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -84,15 +84,8 @@
 	typedef uint32_t cpu_stack_t;
 	#define SIZEOF_CPUSTACK_T 4
 
-	#if CPU_ARM
-		typedef uint64_t cpu_aligned_stack_t;
-		#define SIZEOF_CPUALIGNED_T 8
-	#elif CPU_CM3
-		typedef uint32_t cpu_aligned_stack_t;
-		#define SIZEOF_CPUALIGNED_T 4
-	#else
-		#error CPU configuration error
-	#endif
+	typedef uint64_t cpu_aligned_stack_t;
+	#define SIZEOF_CPUALIGNED_T 8
 
 #elif CPU_PPC
 
@@ -127,6 +120,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
@@ -240,4 +241,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 */