From a07d46f30ac86b125a6dbc89ba83669c3ebe90ac Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 17 May 2011 17:04:12 +0000
Subject: ARMv7-M compact kernel mode working.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2968 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/ports/GCC/ARMCMx/chcore_v7m.c |  2 +-
 os/ports/GCC/ARMCMx/chcore_v7m.h |  6 +++---
 os/ports/GCC/ARMCMx/port.dox     | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'os')

diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c
index da3f7b956..2cf5cfe6b 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.c
@@ -96,7 +96,7 @@ void SVCallVector(void) {
  * @brief   PendSV vector.
  * @details The PendSV vector is used for exception mode re-entering after a
  *          context switch.
- * @note    The PendSV vector is only used in normal kernel mode.
+ * @note    The PendSV vector is only used in compact kernel mode.
  */
 void PendSVVector(void) {
   register struct extctx *ctxp;
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index ef7860b87..7a7eaeb53 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -39,7 +39,7 @@
 
 /**
  * @brief   Simplified priority handling flag.
- * @details Activating this option will make the Kernel work in normal mode.
+ * @details Activating this option will make the Kernel work in compact mode.
  */
 #ifndef CORTEX_SIMPLIFIED_PRIORITY
 #define CORTEX_SIMPLIFIED_PRIORITY      FALSE
@@ -67,7 +67,7 @@
 
 /**
  * @brief   BASEPRI level within kernel lock.
- * @note    In normal kernel mode this constant value is enforced to zero.
+ * @note    In compact kernel mode this constant value is enforced to zero.
  */
 #if !CORTEX_SIMPLIFIED_PRIORITY || defined(__DOXYGEN__)
 #define CORTEX_BASEPRI_KERNEL                                               \
@@ -113,7 +113,7 @@
 #if !CORTEX_SIMPLIFIED_PRIORITY || defined(__DOXYGEN__)
 #define CH_PORT_INFO                    "Advanced kernel mode"
 #else
-#define CH_PORT_INFO                    "Normal kernel mode"
+#define CH_PORT_INFO                    "Compact kernel mode"
 #endif
 
 /*===========================================================================*/
diff --git a/os/ports/GCC/ARMCMx/port.dox b/os/ports/GCC/ARMCMx/port.dox
index 8f4a9bd51..689791c2f 100644
--- a/os/ports/GCC/ARMCMx/port.dox
+++ b/os/ports/GCC/ARMCMx/port.dox
@@ -28,25 +28,25 @@
  *
  * @section ARMCMx_MODES Kernel Modes
  * The Cortex-Mx port supports two distinct kernel modes:
- * - <b>Normal Kernel</b> mode. In this mode the kernel handles IRQ priorities
- *   in a simplified way, all interrupt sources are disabled when the kernel
- *   enters into a critical zone and re-enabled on exit. This is simple and
- *   adequate for most applications, this mode results in a more compact and
- *   faster kernel.
  * - <b>Advanced Kernel</b> mode. In this mode the kernel only masks
  *   interrupt sources with priorities below or equal to the
  *   @p CORTEX_BASEPRI_KERNEL level. Higher priorities are not affected by
  *   the kernel critical sections and can be used for fast interrupts.
  *   This mode is not available in the ARMv6-M architecture which does not
  *   support priority masking.
+ * - <b>Compact Kernel</b> mode. In this mode the kernel handles IRQ priorities
+ *   in a simplified way, all interrupt sources are disabled when the kernel
+ *   enters into a critical zone and re-enabled on exit. This is simple and
+ *   adequate for most applications, this mode results in a more compact and
+ *   faster kernel.
  * .
  * The selection of the mode is performed using the port configuration option
  * @p CORTEX_SIMPLIFIED_PRIORITY. Apart from the different handling of
  * interrupts there are no other differences between the two modes. The
  * kernel API is exactly the same.
  *
- * @section ARMCMx_STATES_A System logical states in Normal Kernel mode
- * The ChibiOS/RT logical @ref system_states are mapped as follow in Normal
+ * @section ARMCMx_STATES_A System logical states in Compact Kernel mode
+ * The ChibiOS/RT logical @ref system_states are mapped as follow in Compact
  * Kernel mode:
  * - <b>Init</b>. This state is represented by the startup code and the
  *   initialization code before @p chSysInit() is executed. It has not a
-- 
cgit v1.2.3