From a3e2fd30898b3890a53a505103b5e2535fc34533 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Thu, 26 Mar 2015 11:12:55 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7810
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/nil/ports/ARMCMx/nilcore.h     | 37 ++-----------------------------------
 os/nil/ports/ARMCMx/nilcore_v6m.h |  5 +++--
 os/nil/ports/ARMCMx/nilcore_v7m.h |  4 ++--
 3 files changed, 7 insertions(+), 39 deletions(-)

(limited to 'os/nil')

diff --git a/os/nil/ports/ARMCMx/nilcore.h b/os/nil/ports/ARMCMx/nilcore.h
index d2777aeee..dd5756cf3 100644
--- a/os/nil/ports/ARMCMx/nilcore.h
+++ b/os/nil/ports/ARMCMx/nilcore.h
@@ -66,17 +66,6 @@
 
 /** @} */
 
-/**
- * @name    Cortex-M variants
- * @{
- */
-#define CORTEX_M0                       0   /**< @brief Cortex-M0 variant.  */
-#define CORTEX_M0PLUS                   1   /**< @brief Cortex-M0+ variant. */
-#define CORTEX_M1                       10  /**< @brief Cortex-M1 variant.  */
-#define CORTEX_M3                       30  /**< @brief Cortex-M3 variant.  */
-#define CORTEX_M4                       40  /**< @brief Cortex-M4 variant.  */
-/** @} */
-
 /* Inclusion of the Cortex-Mx implementation specific parameters.*/
 #include "cmparams.h"
 
@@ -98,27 +87,6 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-/* The following code is not processed when the file is included from an
-   asm module.*/
-#if !defined(_FROM_ASM_)
-
-/*
- * Inclusion of the appropriate CMSIS header for the selected device.
- */
-#if CORTEX_MODEL == CORTEX_M0
-#include "core_cm0.h"
-#elif CORTEX_MODEL == CORTEX_M0PLUS
-#include "core_cm0plus.h"
-#elif CORTEX_MODEL == CORTEX_M3
-#include "core_cm3.h"
-#elif CORTEX_MODEL == CORTEX_M4
-#include "core_cm4.h"
-#else
-#error "unknown or unsupported Cortex-M model"
-#endif
-
-#endif /* !defined(_FROM_ASM_) */
-
 /*===========================================================================*/
 /* Module data structures and types.                                         */
 /*===========================================================================*/
@@ -211,10 +179,9 @@ struct port_intctx {};
 /*===========================================================================*/
 
 /* Includes the sub-architecture-specific part.*/
-#if (CORTEX_MODEL == CORTEX_M0) || (CORTEX_MODEL == CORTEX_M0PLUS) ||       \
-    (CORTEX_MODEL == CORTEX_M1)
+#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
 #include "nilcore_v6m.h"
-#elif (CORTEX_MODEL == CORTEX_M3) || (CORTEX_MODEL == CORTEX_M4)
+#elif (CORTEX_MODEL == 3) || (CORTEX_MODEL == 4)
 #include "nilcore_v7m.h"
 #endif
 
diff --git a/os/nil/ports/ARMCMx/nilcore_v6m.h b/os/nil/ports/ARMCMx/nilcore_v6m.h
index a03e3c900..3a500d2b0 100644
--- a/os/nil/ports/ARMCMx/nilcore_v6m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v6m.h
@@ -99,7 +99,8 @@
  * @name    Architecture and Compiler
  * @{
  */
-#if (CORTEX_MODEL == CORTEX_M0) || defined(__DOXYGEN__)
+#if ((CORTEX_MODEL == 0) && !defined(__CORE_CM0PLUS_H_DEPENDANT)) ||        \
+    defined(__DOXYGEN__)
 /**
  * @brief   Macro defining the specific ARM architecture.
  */
@@ -115,7 +116,7 @@
  */
 #define PORT_CORE_VARIANT_NAME          "Cortex-M0"
 
-#elif (CORTEX_MODEL == CORTEX_M0PLUS)
+#elif (CORTEX_MODEL == 0) && defined(__CORE_CM0PLUS_H_DEPENDANT)
 #define PORT_ARCHITECTURE_ARM_v6M
 #define PORT_ARCHITECTURE_NAME          "ARMv6-M"
 #define PORT_CORE_VARIANT_NAME          "Cortex-M0+"
diff --git a/os/nil/ports/ARMCMx/nilcore_v7m.h b/os/nil/ports/ARMCMx/nilcore_v7m.h
index 603ff8d7a..4e7829d2d 100644
--- a/os/nil/ports/ARMCMx/nilcore_v7m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v7m.h
@@ -139,7 +139,7 @@
  * @name    Architecture and Compiler
  * @{
  */
-#if (CORTEX_MODEL == CORTEX_M3) || defined(__DOXYGEN__)
+#if (CORTEX_MODEL == 3) || defined(__DOXYGEN__)
 /**
  * @brief   Macro defining the specific ARM architecture.
  */
@@ -155,7 +155,7 @@
  */
 #define PORT_CORE_VARIANT_NAME          "Cortex-M3"
 
-#elif (CORTEX_MODEL == CORTEX_M4)
+#elif (CORTEX_MODEL == 4)
 #define PORT_ARCHITECTURE_ARM_v7ME
 #define PORT_ARCHITECTURE_NAME          "ARMv7-ME"
 #if CORTEX_USE_FPU
-- 
cgit v1.2.3