Provisional STM32F2xx support.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3649 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 211 insertions, 59 deletions

diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h
index 280b987e9..15cf9ac96 100644
--- a/os/ports/GCC/ARMCMx/chcore.h
+++ b/os/ports/GCC/ARMCMx/chcore.h
@@ -176,82 +176,34 @@
 

 #include "nvic.h"

 

+/* The following declarations are there just for Doxygen documentation, the

+   real declarations are inside the sub-headers.*/

+#if defined(__DOXYGEN__)

+

 /**

  * @brief   Stack and memory alignment enforcement.

  * @note    In this architecture the stack alignment is enforced to 64 bits,

  *          32 bits alignment is supported by hardware but deprecated by ARM,

  *          the implementation choice is to not offer the option.

  */

-#if defined(__DOXYGEN__)

-/* Dummy declaration, for Doxygen only.*/

 typedef uint64_t stkalign_t;

-#else

-typedef uint64_t stkalign_t __attribute__ ((aligned (8)));

-#endif

 

-#if defined(__DOXYGEN__)

 /**

  * @brief   Interrupt saved context.

  * @details This structure represents the stack frame saved during a

  *          preemption-capable interrupt handler.

  * @note    It is implemented to match the Cortex-Mx exception context.

  */

-struct extctx {

-  /* Dummy definition, just for Doxygen.*/

-};

+struct extctx {};

 

 /**

  * @brief   System saved context.

  * @details This structure represents the inner stack frame during a context

  *          switching.

  */

-struct intctx {

-  /* Dummy definition, just for Doxygen.*/

-};

-#endif

+struct intctx {};

 

-/**

- * @brief   Platform dependent part of the @p Thread structure.

- * @details In this port the structure just holds a pointer to the @p intctx

- *          structure representing the stack pointer at context switch time.

- */

-struct context {

-  struct intctx *r13;

-};

-

-/**

- * @brief   Platform dependent part of the @p chThdCreateI() API.

- * @details This code usually setup the context switching frame represented

- *          by an @p intctx structure.

- */

-#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                          \

-  tp->p_ctx.r13 = (struct intctx *)((uint8_t *)workspace +                  \

-                                     wsize -                                \

-                                     sizeof(struct intctx));                \

-  tp->p_ctx.r13->r4 = pf;                                                   \

-  tp->p_ctx.r13->r5 = arg;                                                  \

-  tp->p_ctx.r13->lr = _port_thread_start;                                   \

-}

-

-/**

- * @brief   Enforces a correct alignment for a stack area size value.

- */

-#define STACK_ALIGN(n) ((((n) - 1) | (sizeof(stkalign_t) - 1)) + 1)

-

-/**

- * @brief   Computes the thread working area global size.

- */

-#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \

-                                   sizeof(struct intctx) +                  \

-                                   sizeof(struct extctx) +                  \

-                                   (n) + (PORT_INT_REQUIRED_STACK))

-

-/**

- * @brief   Static working area allocation.

- * @details This macro is used to allocate a static thread working area

- *          aligned as both position and size.

- */

-#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)]

+#endif /* defined(__DOXYGEN__) */

 

 #endif /* _FROM_ASM_ */

 

diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h
index 88c1cb28b..0997ddeea 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.h
@@ -42,10 +42,61 @@
 #define CORTEX_PRIORITY_PENDSV          0

 

 /*===========================================================================*/

+/* Port macros.                                                              */

+/*===========================================================================*/

+

+/*===========================================================================*/

 /* Port configurable parameters.                                             */

 /*===========================================================================*/

 

 /**

+ * @brief   Stack size for the system idle thread.

+ * @details This size depends on the idle thread implementation, usually

+ *          the idle thread should take no more space than those reserved

+ *          by @p PORT_INT_REQUIRED_STACK.

+ * @note    In this port it is set to 16 because the idle thread does have

+ *          a stack frame when compiling without optimizations. You may

+ *          reduce this value to zero when compiling with optimizations.

+ */

+#if !defined(PORT_IDLE_THREAD_STACK_SIZE)

+#define PORT_IDLE_THREAD_STACK_SIZE     16

+#endif

+

+/**

+ * @brief   Per-thread stack overhead for interrupts servicing.

+ * @details This constant is used in the calculation of the correct working

+ *          area size.

+ *          This value can be zero on those architecture where there is a

+ *          separate interrupt stack and the stack space between @p intctx and

+ *          @p extctx is known to be zero.

+ * @note    In this port it is conservatively set to 16 because the function

+ *          @p chSchDoReschedule() can have a stack frame, expecially with

+ *          compiler optimizations disabled.

+ */

+#if !defined(PORT_INT_REQUIRED_STACK)

+#define PORT_INT_REQUIRED_STACK         16

+#endif

+

+/**

+ * @brief   Enables the use of the WFI instruction in the idle thread loop.

+ */

+#if !defined(CORTEX_ENABLE_WFI_IDLE)

+#define CORTEX_ENABLE_WFI_IDLE          FALSE

+#endif

+

+/**

+ * @brief   SYSTICK handler priority.

+ * @note    The default SYSTICK handler priority is calculated as the priority

+ *          level in the middle of the numeric priorities range.

+ */

+#if !defined(CORTEX_PRIORITY_SYSTICK)

+#define CORTEX_PRIORITY_SYSTICK         (CORTEX_PRIORITY_LEVELS >> 1)

+#elif !CORTEX_IS_VALID_PRIORITY(CORTEX_PRIORITY_SYSTICK)

+/* If it is externally redefined then better perform a validity check on it.*/

+#error "invalid priority level specified for CORTEX_PRIORITY_SYSTICK"

+#endif

+

+/**

  * @brief   Alternate preemption method.

  * @details Activating this option will make the Kernel use the PendSV

  *          handler for preemption instead of the NMI handler.

@@ -101,7 +152,12 @@
  */

 typedef void *regarm_t;

 

+ /* The documentation of the following declarations is in chconf.h in order

+    to not have duplicated structure names into the documentation.*/

 #if !defined(__DOXYGEN__)

+

+typedef uint64_t stkalign_t __attribute__ ((aligned (8)));

+

 struct extctx {

   regarm_t      r0;

   regarm_t      r1;

@@ -124,7 +180,51 @@ struct intctx {
   regarm_t      r7;

   regarm_t      lr;

 };

-#endif

+

+#endif /* !defined(__DOXYGEN__) */

+

+/**

+ * @brief   Platform dependent part of the @p Thread structure.

+ * @details In this port the structure just holds a pointer to the @p intctx

+ *          structure representing the stack pointer at context switch time.

+ */

+struct context {

+  struct intctx *r13;

+};

+

+/**

+ * @brief   Platform dependent part of the @p chThdCreateI() API.

+ * @details This code usually setup the context switching frame represented

+ *          by an @p intctx structure.

+ */

+#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                          \

+  tp->p_ctx.r13 = (struct intctx *)((uint8_t *)workspace +                  \

+                                     wsize -                                \

+                                     sizeof(struct intctx));                \

+  tp->p_ctx.r13->r4 = pf;                                                   \

+  tp->p_ctx.r13->r5 = arg;                                                  \

+  tp->p_ctx.r13->lr = _port_thread_start;                                   \

+}

+

+/**

+ * @brief   Enforces a correct alignment for a stack area size value.

+ */

+#define STACK_ALIGN(n) ((((n) - 1) | (sizeof(stkalign_t) - 1)) + 1)

+

+/**

+ * @brief   Computes the thread working area global size.

+ */

+#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \

+                                   sizeof(struct intctx) +                  \

+                                   sizeof(struct extctx) +                  \

+                                   (n) + (PORT_INT_REQUIRED_STACK))

+

+/**

+ * @brief   Static working area allocation.

+ * @details This macro is used to allocate a static thread working area

+ *          aligned as both position and size.

+ */

+#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)]

 

 /**

  * @brief   IRQ prologue code.

diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index 46979920f..86b49a095 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -39,10 +39,61 @@
 #define CORTEX_BASEPRI_DISABLED         0

 

 /*===========================================================================*/

+/* Port macros.                                                              */

+/*===========================================================================*/

+

+/*===========================================================================*/

 /* Port configurable parameters.                                             */

 /*===========================================================================*/

 

 /**

+ * @brief   Stack size for the system idle thread.

+ * @details This size depends on the idle thread implementation, usually

+ *          the idle thread should take no more space than those reserved

+ *          by @p PORT_INT_REQUIRED_STACK.

+ * @note    In this port it is set to 16 because the idle thread does have

+ *          a stack frame when compiling without optimizations. You may

+ *          reduce this value to zero when compiling with optimizations.

+ */

+#if !defined(PORT_IDLE_THREAD_STACK_SIZE)

+#define PORT_IDLE_THREAD_STACK_SIZE     16

+#endif

+

+/**

+ * @brief   Per-thread stack overhead for interrupts servicing.

+ * @details This constant is used in the calculation of the correct working

+ *          area size.

+ *          This value can be zero on those architecture where there is a

+ *          separate interrupt stack and the stack space between @p intctx and

+ *          @p extctx is known to be zero.

+ * @note    In this port it is conservatively set to 16 because the function

+ *          @p chSchDoReschedule() can have a stack frame, expecially with

+ *          compiler optimizations disabled.

+ */

+#if !defined(PORT_INT_REQUIRED_STACK)

+#define PORT_INT_REQUIRED_STACK         16

+#endif

+

+/**

+ * @brief   Enables the use of the WFI instruction in the idle thread loop.

+ */

+#if !defined(CORTEX_ENABLE_WFI_IDLE)

+#define CORTEX_ENABLE_WFI_IDLE          FALSE

+#endif

+

+/**

+ * @brief   SYSTICK handler priority.

+ * @note    The default SYSTICK handler priority is calculated as the priority

+ *          level in the middle of the numeric priorities range.

+ */

+#if !defined(CORTEX_PRIORITY_SYSTICK)

+#define CORTEX_PRIORITY_SYSTICK         (CORTEX_PRIORITY_LEVELS >> 1)

+#elif !CORTEX_IS_VALID_PRIORITY(CORTEX_PRIORITY_SYSTICK)

+/* If it is externally redefined then better perform a validity check on it.*/

+#error "invalid priority level specified for CORTEX_PRIORITY_SYSTICK"

+#endif

+

+/**

  * @brief   Simplified priority handling flag.

  * @details Activating this option will make the Kernel work in compact mode.

  */

@@ -156,7 +207,12 @@
  */

 typedef void *regarm_t;

 

+/* The documentation of the following declarations is in chconf.h in order

+   to not have duplicated structure names into the documentation.*/

 #if !defined(__DOXYGEN__)

+

+typedef uint64_t stkalign_t __attribute__ ((aligned (8)));

+

 struct extctx {

   regarm_t      r0;

   regarm_t      r1;

@@ -166,7 +222,7 @@ struct extctx {
   regarm_t      lr_thd;

   regarm_t      pc;

   regarm_t      xpsr;

-#if CORTEX_USE_FPU || defined(__DOXYGEN__)

+#if CORTEX_USE_FPU

   regarm_t      s0;

   regarm_t      s1;

   regarm_t      s2;

@@ -189,7 +245,7 @@ struct extctx {
 };

 

 struct intctx {

-#if CORTEX_USE_FPU || defined(__DOXYGEN__)

+#if CORTEX_USE_FPU

   regarm_t      s16;

   regarm_t      s17;

   regarm_t      s18;

@@ -217,7 +273,51 @@ struct intctx {
   regarm_t      r11;

   regarm_t      lr;

 };

-#endif

+

+#endif /* !defined(__DOXYGEN__) */

+

+/**

+ * @brief   Platform dependent part of the @p Thread structure.

+ * @details In this port the structure just holds a pointer to the @p intctx

+ *          structure representing the stack pointer at context switch time.

+ */

+struct context {

+  struct intctx *r13;

+};

+

+/**

+ * @brief   Platform dependent part of the @p chThdCreateI() API.

+ * @details This code usually setup the context switching frame represented

+ *          by an @p intctx structure.

+ */

+#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                          \

+  tp->p_ctx.r13 = (struct intctx *)((uint8_t *)workspace +                  \

+                                     wsize -                                \

+                                     sizeof(struct intctx));                \

+  tp->p_ctx.r13->r4 = pf;                                                   \

+  tp->p_ctx.r13->r5 = arg;                                                  \

+  tp->p_ctx.r13->lr = _port_thread_start;                                   \

+}

+

+/**

+ * @brief   Enforces a correct alignment for a stack area size value.

+ */

+#define STACK_ALIGN(n) ((((n) - 1) | (sizeof(stkalign_t) - 1)) + 1)

+

+/**

+ * @brief   Computes the thread working area global size.

+ */

+#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \

+                                   sizeof(struct intctx) +                  \

+                                   sizeof(struct extctx) +                  \

+                                   (n) + (PORT_INT_REQUIRED_STACK))

+

+/**

+ * @brief   Static working area allocation.

+ * @details This macro is used to allocate a static thread working area

+ *          aligned as both position and size.

+ */

+#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)]

 

 /**

  * @brief   IRQ prologue code.