diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-05-26 10:15:33 +0000 | 
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-05-26 10:15:33 +0000 | 
| commit | 9ffa6324d43fc1e8fd5333a7d8bc517df5e1da42 (patch) | |
| tree | d116275944383967725db68e580c0dd929b885f0 | |
| parent | 1a9115dff31fb841a19bfc204ac6054e0f3b7a36 (diff) | |
| download | ChibiOS-9ffa6324d43fc1e8fd5333a7d8bc517df5e1da42.tar.gz ChibiOS-9ffa6324d43fc1e8fd5333a7d8bc517df5e1da42.tar.bz2 ChibiOS-9ffa6324d43fc1e8fd5333a7d8bc517df5e1da42.zip  | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1958 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/kernel/templates/chcore.h | 10 | ||||
| -rw-r--r-- | os/ports/RC/STM8/chcore.h | 30 | ||||
| -rw-r--r-- | readme.txt | 1 | 
3 files changed, 21 insertions, 20 deletions
diff --git a/os/kernel/templates/chcore.h b/os/kernel/templates/chcore.h index bd5d824b6..f7e2e417c 100644 --- a/os/kernel/templates/chcore.h +++ b/os/kernel/templates/chcore.h @@ -80,7 +80,7 @@ struct context {   * @details This code usually setup the context switching frame represented
   *          by an @p intctx structure.
   */
 -#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                      \
 +#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                          \
  }
  /**
 @@ -113,9 +113,9 @@ struct context {  /**
   * @brief   Computes the thread working area global size.
   */
 -#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
 -                                   sizeof(struct intctx) +              \
 -                                   sizeof(struct extctx) +              \
 +#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \
 +                                   sizeof(struct intctx) +                  \
 +                                   sizeof(struct extctx) +                  \
                                    (n) + (INT_REQUIRED_STACK))
  /**
 @@ -123,7 +123,7 @@ struct context {   * @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)];
 +#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)]
  /**
   * @brief   IRQ prologue code.
 diff --git a/os/ports/RC/STM8/chcore.h b/os/ports/RC/STM8/chcore.h index 54a30584f..6fa112346 100644 --- a/os/ports/RC/STM8/chcore.h +++ b/os/ports/RC/STM8/chcore.h @@ -118,15 +118,15 @@ struct stm8_startctx {   * @details This code usually setup the context switching frame represented
   *          by an @p intctx structure.
   */
 -#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                      \
 -  struct stm8_startctx *scp;                                            \
 -  scp = (struct stm8_startctx *)((uint8_t *)workspace + wsize  -        \
 -                            sizeof(struct stm8_startctx));              \
 -  scp->ts   = _port_thread_start;                                       \
 -  scp->arg  = arg;                                                      \
 -  scp->pc   = (stm8func_t)pf;                                           \
 -  scp->ret  = (stm8func_t)chThdExit;                                    \
 -  tp->p_ctx.sp = (struct intctx *)scp;                                  \
 +#define SETUP_CONTEXT(workspace, wsize, pf, arg) {                          \
 +  struct stm8_startctx *scp;                                                \
 +  scp = (struct stm8_startctx *)((uint8_t *)workspace + wsize -             \
 +                                 sizeof(struct stm8_startctx));             \
 +  scp->ts   = _port_thread_start;                                           \
 +  scp->arg  = arg;                                                          \
 +  scp->pc   = (stm8func_t)pf;                                               \
 +  scp->ret  = (stm8func_t)chThdExit;                                        \
 +  tp->p_ctx.sp = (struct intctx *)scp;                                      \
  }
  /**
 @@ -159,9 +159,9 @@ struct stm8_startctx {  /**
   * @brief   Computes the thread working area global size.
   */
 -#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
 -                                   (sizeof(struct intctx) - 1) +        \
 -                                   (sizeof(struct extctx) - 1) +        \
 +#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \
 +                                   (sizeof(struct intctx) - 1) +            \
 +                                   (sizeof(struct extctx) - 1) +            \
                                     (n) + (INT_REQUIRED_STACK))
  /**
 @@ -183,9 +183,9 @@ struct stm8_startctx {   * @details This macro must be inserted at the end of all IRQ handlers
   *          enabled to invoke system APIs.
   */
 -#define PORT_IRQ_EPILOGUE() {   \
 -  if (chSchIsRescRequiredExI()) \
 -      chSchDoRescheduleI();     \
 +#define PORT_IRQ_EPILOGUE() {                                               \
 +  if (chSchIsRescRequiredExI())                                             \
 +    chSchDoRescheduleI();                                                   \
  }
  /**
 diff --git a/readme.txt b/readme.txt index b6fb771cc..031d12e73 100644 --- a/readme.txt +++ b/readme.txt @@ -60,6 +60,7 @@  *** 1.5.8 ***
  - FIX: Fixed missing files from ST library zip file (bug 3006629).
 +- Formatting fixes to the port templates.
  - Added notes about copyright assignment to the documentation. Fixed some
    problems in the licensing FAQ page.
  | 
