X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Ftypes.h;h=08772a97daaa5b9f72799fa78122284d4f18f1eb;hb=f7f68ef253b16438a1676ab594e8f53f51dfe418;hp=bb4aa79f2092982c9b414c865413462d7b5bea9f;hpb=32d1445272120a254d77ce8d1af1f527da7a2c17;p=bertos.git

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index bb4aa79f..08772a97 100644
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -77,13 +77,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
@@ -232,4 +233,24 @@ 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)))
+
+#define HWREGBITW(x, b) \
+        HWREG(((reg32_t)(x) & 0xF0000000) | 0x02000000 |		\
+              (((reg32_t)(x) & 0x000FFFFF) << 5) | ((b) << 2))
+#define HWREGBITH(x, b) \
+        HWREGH(((reg32_t)(x) & 0xF0000000) | 0x02000000 |		\
+               (((reg32_t)(x) & 0x000FFFFF) << 5) | ((b) << 2))
+#define HWREGBITB(x, b) \
+        HWREGB(((reg32_t)(x) & 0xF0000000) | 0x02000000 |		\
+               (((reg32_t)(x) & 0x000FFFFF) << 5) | ((b) << 2))
+/*\}*/
+
 #endif /* CPU_TYPES_H */