From 677271b6c34a6f554ad2b401d495a8145828bda0 Mon Sep 17 00:00:00 2001
From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 4 May 2010 08:54:52 +0000
Subject: [PATCH] CM3: move the Cortex-M3 generic hardware macros to a distinct
 file.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3600 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/cortex-m3/io/cm3_types.h  | 58 ++++++++++++++++++++++++++++
 bertos/cpu/cortex-m3/io/lm3s_types.h | 22 +----------
 2 files changed, 60 insertions(+), 20 deletions(-)
 create mode 100644 bertos/cpu/cortex-m3/io/cm3_types.h

diff --git a/bertos/cpu/cortex-m3/io/cm3_types.h b/bertos/cpu/cortex-m3/io/cm3_types.h
new file mode 100644
index 00000000..8cb94855
--- /dev/null
+++ b/bertos/cpu/cortex-m3/io/cm3_types.h
@@ -0,0 +1,58 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief Cortex-M3 generic hardware macros.
+ */
+
+#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/cortex-m3/io/lm3s_types.h b/bertos/cpu/cortex-m3/io/lm3s_types.h
index ab1a822b..b88347b4 100644
--- a/bertos/cpu/cortex-m3/io/lm3s_types.h
+++ b/bertos/cpu/cortex-m3/io/lm3s_types.h
@@ -30,32 +30,14 @@
  *
  * -->
  *
- * \brief LM3S1968 generic hardware macros.
+ * \brief LM3S generic hardware macros.
  */
 
 #ifndef LM3S_TYPES_H
 #define LM3S_TYPES_H
 
 #include <cfg/compiler.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))
-/*\}*/
+#include <io/cm3_types.h>
 
 /**
  * Helper Macros for determining the particular hardware revision.
-- 
2.25.1