From f7f68ef253b16438a1676ab594e8f53f51dfe418 Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 26 Jul 2010 15:33:27 +0000
Subject: [PATCH] Move cm3 type to generic types header.

git-svn-id: https://src.develer.com/svnoss/bertos/branches/i2c@4072 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/cortex-m3/io/cm3_types.h | 18 ------------------
 bertos/cpu/types.h                  | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/bertos/cpu/cortex-m3/io/cm3_types.h b/bertos/cpu/cortex-m3/io/cm3_types.h
index 8cb94855..967e3f3d 100644
--- a/bertos/cpu/cortex-m3/io/cm3_types.h
+++ b/bertos/cpu/cortex-m3/io/cm3_types.h
@@ -36,23 +36,5 @@
 #ifndef CM3_TYPES_H
 #define CM3_TYPES_H
 
-/**
- * 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 /* CM3_TYPES_H */
diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index d7e3e8bd..08772a97 100644
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -233,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 */
-- 
2.25.1