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

6 files changed, 35 insertions, 18 deletions

diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h
index 4f3800f1a..20255d652 100644
--- a/ports/ARM7/chcore.h
+++ b/ports/ARM7/chcore.h
@@ -48,8 +48,8 @@ typedef uint32_t stkalign_t;
  */

 typedef void *regarm_t;

 

+/** @cond never */

 /**

- * Interrupt saved context.

  * This structure represents the stack frame saved during a preemption-capable

  * interrupt handler.

  */

@@ -63,9 +63,10 @@ struct extctx {
   regarm_t      r12;

   regarm_t      lr_usr;

 };

+/** @endcond */

 

+/** @cond never */

 /**

- * System saved context.

  * This structure represents the inner stack frame during a context switching.

  */

 struct intctx {

@@ -81,15 +82,17 @@ struct intctx {
   regarm_t      r11;

   regarm_t      lr;

 };

+/** @endcond */

 

+/** @cond never */

 /**

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

  * In the ARM7 port this structure contains just the copy of the user mode

  * stack pointer.

  */

-typedef struct {

+struct context {

   struct intctx *r13;

-} Context;

+};

+/** @endcond */

 

 /**

  * Platform dependent part of the @p chThdInit() API.

diff --git a/ports/ARMCM3/chcore.h b/ports/ARMCM3/chcore.h
index 85dcd0044..505668698 100644
--- a/ports/ARMCM3/chcore.h
+++ b/ports/ARMCM3/chcore.h
@@ -96,14 +96,16 @@ typedef uint32_t stkalign_t;
  */

 typedef void *regarm_t;

 

+/** @cond never */

 /**

  * Interrupt saved context, empty in this architecture.

  */

 struct extctx {

 };

+/** @endcond */

 

+/** @cond never */

 /**

- * System saved context.

  * This structure represents the inner stack frame during a context switching.

  */

 struct intctx {

@@ -128,13 +130,16 @@ struct intctx {
   regarm_t      pc;

   regarm_t      xpsr;

 };

+/** @endcond */

 

+/** @cond never */

 /**

  * Cortex-M3 context structure.

  */

-typedef struct {

+struct context {

   struct intctx *r13;

-} Context;

+};

+/** @endcond */

 

 /**

  * Platform dependent part of the @p chThdInit() API.

diff --git a/ports/AVR/chcore.h b/ports/AVR/chcore.h
index a03e58acc..141255d8b 100644
--- a/ports/AVR/chcore.h
+++ b/ports/AVR/chcore.h
@@ -45,6 +45,7 @@
  */

 typedef uint8_t stkalign_t;

 

+/** @cond never */

 /**

  * Interrupt saved context.

  * @note The field @p _next is not part of the context, it represents the

@@ -69,7 +70,9 @@ struct extctx {
   uint8_t       r0;

   uint16_t      pc;

 };

+/** @endcond */

 

+/** @cond never */

 /**

  * System saved context.

  * @note The field @p _next is not part of the context, it represents the

@@ -100,15 +103,17 @@ struct intctx {
   uint8_t       pcl;

   uint8_t       pch;

 };

+/** @endcond */

 

+/** @cond never */

 /**

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

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

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

  */

-typedef struct {

+struct context {

   struct intctx *sp;

-} Context;

+};

+/** @endcond */

 

 /**

  * Platform dependent part of the @p chThdInit() API.

diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h
index 642e53286..08240835a 100644
--- a/ports/MSP430/chcore.h
+++ b/ports/MSP430/chcore.h
@@ -50,6 +50,7 @@ typedef uint16_t stkalign_t;
  */

 typedef void *regmsp_t;

 

+/** @cond never */

 /**

  * Interrupt saved context.

  */

@@ -61,9 +62,10 @@ struct extctx {
   regmsp_t      sr;

   regmsp_t      pc;

 };

+/** @endcond */

 

+/** @cond never */

 /**

- * System saved context.

  * This structure represents the inner stack frame during a context switching.

  */

 struct intctx {

@@ -77,15 +79,17 @@ struct intctx {
   regmsp_t      r11;

   regmsp_t      pc;

 };

+/** @endcond */

 

+/** @cond never */

 /**

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

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

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

  */

-typedef struct {

+struct context {

   struct intctx *sp;

-} Context;

+};

+/** @endcond */

 

 /**

  * Platform dependent part of the @p chThdInit() API.

diff --git a/src/include/threads.h b/src/include/threads.h
index cd3856b34..68f7f9bb9 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -49,7 +49,7 @@ struct Thread {
   /** Mode flags. */
   tmode_t               p_flags;
   /** Machine dependent processor context.*/
-  Context               p_ctx;
+  struct context        p_ctx;
 #ifdef CH_USE_NESTED_LOCKS
   cnt_t                 p_locks;
 #endif
diff --git a/src/templates/chcore.h b/src/templates/chcore.h
index e4cf7d89e..7c3fe4f0d 100644
--- a/src/templates/chcore.h
+++ b/src/templates/chcore.h
@@ -57,9 +57,9 @@ struct intctx {
  * This structure usually contains just the saved stack pointer defined as a

  * pointer to a @p intctx structure.

  */

-typedef struct {

+struct context {

   struct intctx *sp;

-} Context;

+};

 

 /**

  * Platform dependent part of the @p chThdInit() API.