Use different api name for new i2c interface. Comply all driver.

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

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index bb4aa79f2092982c9b414c865413462d7b5bea9f..cbef8c4126f38916d0d8e158ff36b2d9b34fced2 100644 (file)
--- 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,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 */