Tree reorganization.

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

4 files changed, 45 insertions, 607 deletions

diff --git a/os/rt/templates/chconf.h b/os/rt/templates/chconf.h
index 211233d36..9bf08a34d 100644
--- a/os/rt/templates/chconf.h
+++ b/os/rt/templates/chconf.h
@@ -28,6 +28,8 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

+#define _CHIBIOS_RT_CONF_

+

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

 /**

  * @name System timers settings

@@ -46,7 +48,7 @@
  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

-#define CH_CFG_ST_FREQUENCY                 10000

+#define CH_CFG_ST_FREQUENCY                 1000

 

 /**

  * @brief   Time delta constant for the tick-less mode.

@@ -56,7 +58,7 @@
  *          The value one is not valid, timeouts are rounded up to

  *          this value.

  */

-#define CH_CFG_ST_TIMEDELTA                 2

+#define CH_CFG_ST_TIMEDELTA                 0

 

 /** @} */

 

@@ -138,7 +140,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#define CH_CFG_USE_TM                       TRUE

+#define CH_CFG_USE_TM                       FALSE

 

 /**

  * @brief   Threads registry APIs.

@@ -190,6 +192,7 @@
  *          memory footprint.

  *

  * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

 #define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

@@ -333,7 +336,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -342,7 +345,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_ENABLE_CHECKS                FALSE

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -352,16 +355,23 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_ENABLE_ASSERTS               FALSE

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

  * @details If enabled then the context switch circular trace buffer is

  *          activated.

  *

- * @note    The default is @p FALSE.

+ * @note    The default is @p CH_DBG_TRACE_MASK_NONE.

+ */

+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_ALL

+

+/**

+ * @brief   Trace buffer entries.

+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is

+ *          different from @p CH_DBG_TRACE_MASK_NONE.

  */

-#define CH_DBG_ENABLE_TRACE                 FALSE

+#define CH_DBG_TRACE_BUFFER_SIZE            128

 

 /**

  * @brief   Debug option, stack checks.

@@ -373,7 +383,7 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

-#define CH_DBG_ENABLE_STACK_CHECK           FALSE

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -383,7 +393,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_FILL_THREADS                 FALSE

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @brief   Debug option, threads profiling.

@@ -426,10 +436,6 @@
 /**

  * @brief   Threads finalization hook.

  * @details User finalization code added to the @p chThdExit() API.

- *

- * @note    It is inserted into lock zone.

- * @note    It is also invoked when the threads simply return in order to

- *          terminate.

  */

 #define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

@@ -444,12 +450,27 @@
 }

 

 /**

+ * @brief   ISR enter hook.

+ */

+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \

+  /* IRQ prologue code here.*/                                              \

+}

+

+/**

+ * @brief   ISR exit hook.

+ */

+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \

+  /* IRQ epilogue code here.*/                                              \

+}

+

+/**

  * @brief   Idle thread enter hook.

  * @note    This hook is invoked within a critical zone, no OS functions

  *          should be invoked from here.

  * @note    This macro can be used to activate a power saving mode.

  */

 #define CH_CFG_IDLE_ENTER_HOOK() {                                          \

+  /* Idle-enter code here.*/                                                \

 }

 

 /**

@@ -459,6 +480,7 @@
  * @note    This macro can be used to deactivate a power saving mode.

  */

 #define CH_CFG_IDLE_LEAVE_HOOK() {                                          \

+  /* Idle-leave code here.*/                                                \

 }

 

 /**

@@ -487,6 +509,15 @@
   /* System halt code here.*/                                               \

 }

 

+/**

+ * @brief   Trace hook.

+ * @details This hook is invoked each time a new record is written in the

+ *          trace buffer.

+ */

+#define CH_CFG_TRACE_HOOK(tep) {                                            \

+  /* Trace code here.*/                                                     \

+}

+

 /** @} */

 

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

diff --git a/os/rt/templates/chcore.c b/os/rt/templates/chcore.c
deleted file mode 100644
index ef24978a7..000000000
--- a/os/rt/templates/chcore.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.

-

-    This file is part of ChibiOS.

-

-    ChibiOS is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    templates/chcore.c

- * @brief   Port related template code.

- * @details This file is a template of the system driver functions provided by

- *          a port. Some of the following functions may be implemented as

- *          macros in chcore.h if the implementer decides that there is an

- *          advantage in doing so, for example because performance concerns.

- *

- * @addtogroup core

- * @details Non portable code templates.

- * @{

- */

-

-#include "ch.h"

-

-/*===========================================================================*/

-/* Module local definitions.                                                 */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module exported variables.                                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module local types.                                                       */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module local variables.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module local functions.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module exported functions.                                                */

-/*===========================================================================*/

-

-/**

- * @brief   Port-related initialization code.

- * @note    This function is usually empty.

- */

-void _port_init(void) {

-}

-

-/**

- * @brief   Performs a context switch between two threads.

- * @details This is the most critical code in any port, this function

- *          is responsible for the context switch between 2 threads.

- * @note    The implementation of this code affects <b>directly</b> the context

- *          switch performance so optimize here as much as you can.

- *

- * @param[in] ntp       the thread to be switched in

- * @param[in] otp       the thread to be switched out

- */

-void _port_switch(thread_t *ntp, thread_t *otp) {

-}

-

-/** @} */

diff --git a/os/rt/templates/chcore.h b/os/rt/templates/chcore.h
deleted file mode 100644
index bcc47a0f4..000000000
--- a/os/rt/templates/chcore.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.

-

-    This file is part of ChibiOS.

-

-    ChibiOS is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    templates/chcore.h

- * @brief   Port related template macros and structures.

- * @details This file is a template of the system driver macros provided by

- *          a port.

- *

- * @addtogroup core

- * @{

- */

-

-#ifndef _CHCORE_H_

-#define _CHCORE_H_

-

-/*===========================================================================*/

-/* Module constants.                                                         */

-/*===========================================================================*/

-

-/**

- * @name    Architecture and Compiler

- * @{

- */

-/**

- * @brief   Macro defining an XXX architecture.

- */

-#define PORT_ARCHITECTURE_XXX

-

-/**

- * @brief   Macro defining the specific XXX architecture.

- */

-#define PORT_ARCHITECTURE_XXX_YYY

-

-/**

- * @brief   Name of the implemented architecture.

- */

-#define PORT_ARCHITECTURE_NAME          "XXX Architecture"

-

-/**

- * @brief   Compiler name and version.

- */

-#if defined(__GNUC__) || defined(__DOXYGEN__)

-#define PORT_COMPILER_NAME              "GCC " __VERSION__

-

-#else

-#error "unsupported compiler"

-#endif

-

-/**

- * @brief   This port supports a realtime counter.

- */

-#define PORT_SUPPORTS_RT                FALSE

-

-/**

- * @brief   Port-specific information string.

- */

-#define PORT_INFO                       "no info"

-/** @} */

-

-/*===========================================================================*/

-/* Module pre-compile time settings.                                         */

-/*===========================================================================*/

-

-/**

- * @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.

- */

-#if !defined(PORT_IDLE_THREAD_STACK_SIZE) || defined(__DOXYGEN__)

-#define PORT_IDLE_THREAD_STACK_SIZE     32

-#endif

-

-/**

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

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

- *          area size.

- */

-#if !defined(PORT_INT_REQUIRED_STACK) || defined(__DOXYGEN__)

-#define PORT_INT_REQUIRED_STACK         256

-#endif

-

-/**

- * @brief   Enables an alternative timer implementation.

- * @details Usually the port uses a timer interface defined in the file

- *          @p chcore_timer.h, if this option is enabled then the file

- *          @p chcore_timer_alt.h is included instead.

- */

-#if !defined(PORT_USE_ALT_TIMER)

-#define PORT_USE_ALT_TIMER              FALSE

-#endif

-

-/*===========================================================================*/

-/* Derived constants and error checks.                                       */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module data structures and types.                                         */

-/*===========================================================================*/

-

-

-/* The following code is not processed when the file is included from an

-   asm module.*/

-#if !defined(_FROM_ASM_)

-

-/**

- * @brief   Type of stack and memory alignment enforcement.

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

- */

-typedef uint64_t stkalign_t;

-

-/**

- * @brief   Interrupt saved context.

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

- *          preemption-capable interrupt handler.

- * @note    R2 and R13 are not saved because those are assumed to be immutable

- *          during the system life cycle.

- */

-struct port_extctx {

- };

-

-/**

- * @brief   System saved context.

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

- *          switching.

- * @note    R2 and R13 are not saved because those are assumed to be immutable

- *          during the system life cycle.

- * @note    LR is stored in the caller context so it is not present in this

- *          structure.

- */

-struct port_intctx {

-};

-

-/**

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

- * @details This structure usually contains just the saved stack pointer

- *          defined as a pointer to a @p port_intctx structure.

- */

-struct context {

-  struct port_intctx *sp;

-};

-

-#endif /* !defined(_FROM_ASM_) */

-

-/*===========================================================================*/

-/* Module macros.                                                            */

-/*===========================================================================*/

-

-/**

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

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

- *          by an @p port_intctx structure.

- */

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

-}

-

-/**

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

- * @note    There is no need to perform alignments in this macro.

- */

-#define PORT_WA_SIZE(n) (sizeof(struct port_intctx) +                       \

-                         sizeof(struct port_extctx) +                       \

-                         ((size_t)(n)) + ((size_t)(PORT_INT_REQUIRED_STACK)))

-

-/**

- * @brief   Priority level verification macro.

- */

-#define PORT_IRQ_IS_VALID_PRIORITY(n) false

-

-/**

- * @brief   Priority level verification macro.

- */

-#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n) false

-

-/**

- * @brief   IRQ prologue code.

- * @details This macro must be inserted at the start of all IRQ handlers

- *          enabled to invoke system APIs.

- */

-#define PORT_IRQ_PROLOGUE()

-

-/**

- * @brief   IRQ epilogue code.

- * @details This macro must be inserted at the end of all IRQ handlers

- *          enabled to invoke system APIs.

- */

-#define PORT_IRQ_EPILOGUE()

-

-/**

- * @brief   IRQ handler function declaration.

- * @note    @p id can be a function name or a vector number depending on the

- *          port implementation.

- */

-#define PORT_IRQ_HANDLER(id) void id(void)

-

-/**

- * @brief   Fast IRQ handler function declaration.

- * @note    @p id can be a function name or a vector number depending on the

- *          port implementation.

- */

-#define PORT_FAST_IRQ_HANDLER(id) void id(void)

-

-/**

- * @brief   Performs a context switch between two threads.

- * @details This is the most critical code in any port, this function

- *          is responsible for the context switch between 2 threads.

- * @note    The implementation of this code affects <b>directly</b> the context

- *          switch performance so optimize here as much as you can.

- *

- * @param[in] ntp       the thread to be switched in

- * @param[in] otp       the thread to be switched out

- */

-#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

-#define port_switch(ntp, otp) _port_switch(ntp, otp)

-#else

-#define port_switch(ntp, otp) {                                             \

-  register struct port_intctx *sp asm ("%r1");                              \

-  if ((stkalign_t *)(sp - 1) < otp->p_stklimit)                             \

-    chSysHalt("stack overflow");                                            \

-  _port_switch(ntp, otp);                                                   \

-}

-#endif

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-/* The following code is not processed when the file is included from an

-   asm module.*/

-#if !defined(_FROM_ASM_)

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  void _port_init(void);

-  void _port_switch(thread_t *ntp, thread_t *otp);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* !defined(_FROM_ASM_) */

-

-/*===========================================================================*/

-/* Module inline functions.                                                  */

-/*===========================================================================*/

-

-/* The following code is not processed when the file is included from an

-   asm module.*/

-#if !defined(_FROM_ASM_)

-

-/**

- * @brief   Returns a word encoding the current interrupts status.

- *

- * @return              The interrupts status.

- */

-static inline syssts_t port_get_irq_status(void) {

-

-  return 0;

-}

-

-/**

- * @brief   Checks the interrupt status.

- *

- * @param[in] sts       the interrupt status word

- *

- * @return              The interrupt status.

- * @retval false        the word specified a disabled interrupts status.

- * @retval true         the word specified an enabled interrupts status.

- */

-static inline bool port_irq_enabled(syssts_t sts) {

-

-  (void)sts;

-

-  return false;

-}

-

-/**

- * @brief   Determines the current execution context.

- *

- * @return              The execution context.

- * @retval false        not running in ISR mode.

- * @retval true         running in ISR mode.

- */

-static inline bool port_is_isr_context(void) {

-

-  return false;

-}

-

-/**

- * @brief   Kernel-lock action.

- * @details Usually this function just disables interrupts but may perform more

- *          actions.

- */

-static inline void port_lock(void) {

-

-}

-

-/**

- * @brief   Kernel-unlock action.

- * @details Usually this function just enables interrupts but may perform more

- *          actions.

- */

-static inline void port_unlock(void) {

-

-}

-

-/**

- * @brief   Kernel-lock action from an interrupt handler.

- * @details This function is invoked before invoking I-class APIs from

- *          interrupt handlers. The implementation is architecture dependent,

- *          in its simplest form it is void.

- */

-static inline void port_lock_from_isr(void) {

-

-}

-

-/**

- * @brief   Kernel-unlock action from an interrupt handler.

- * @details This function is invoked after invoking I-class APIs from interrupt

- *          handlers. The implementation is architecture dependent, in its

- *          simplest form it is void.

- */

-static inline void port_unlock_from_isr(void) {

-

-}

-

-/**

- * @brief   Disables all the interrupt sources.

- * @note    Of course non-maskable interrupt sources are not included.

- */

-static inline void port_disable(void) {

-

-}

-

-/**

- * @brief   Disables the interrupt sources below kernel-level priority.

- * @note    Interrupt sources above kernel level remains enabled.

- */

-static inline void port_suspend(void) {

-

-}

-

-/**

- * @brief   Enables all the interrupt sources.

- */

-static inline void port_enable(void) {

-

-}

-

-/**

- * @brief   Enters an architecture-dependent IRQ-waiting mode.

- * @details The function is meant to return when an interrupt becomes pending.

- *          The simplest implementation is an empty function or macro but this

- *          would not take advantage of architecture-specific power saving

- *          modes.

- */

-static inline void port_wait_for_interrupt(void) {

-

-#if PPC_ENABLE_WFI_IDLE

-#endif

-}

-

-/**

- * @brief   Returns the current value of the realtime counter.

- *

- * @return              The realtime counter value.

- */

-static inline rtcnt_t port_rt_get_counter_value(void) {

-

-  return 0;

-}

-

-#endif /* !defined(_FROM_ASM_) */

-

-/*===========================================================================*/

-/* Module late inclusions.                                                   */

-/*===========================================================================*/

-

-/* The following code is not processed when the file is included from an

-   asm module.*/

-#if !defined(_FROM_ASM_)

-

-#if CH_CFG_ST_TIMEDELTA > 0

-#if !PORT_USE_ALT_TIMER

-#include "chcore_timer.h"

-#else /* PORT_USE_ALT_TIMER */

-#include "chcore_timer_alt.h"

-#endif /* PORT_USE_ALT_TIMER */

-#endif /* CH_CFG_ST_TIMEDELTA > 0 */

-

-#endif /* !defined(_FROM_ASM_) */

-

-#endif /* _CHCORE_H_ */

-

-/** @} */

diff --git a/os/rt/templates/chtypes.h b/os/rt/templates/chtypes.h
deleted file mode 100644
index 56cfcb783..000000000
--- a/os/rt/templates/chtypes.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.

-

-    This file is part of ChibiOS.

-

-    ChibiOS is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    templates/chtypes.h

- * @brief   System types template.

- * @details The types defined in this file may change depending on the target

- *          architecture. You may also try to optimize the size of the various

- *          types in order to privilege size or performance, be careful in

- *          doing so.

- *

- * @addtogroup types

- * @{

- */

-

-#ifndef _CHTYPES_H_

-#define _CHTYPES_H_

-

-#include <stddef.h>

-#include <stdint.h>

-#include <stdbool.h>

-

-/**

- * @name    Common constants

- */

-/**

- * @brief   Generic 'false' boolean constant.

- */

-#if !defined(FALSE) || defined(__DOXYGEN__)

-#define FALSE               0

-#endif

-

-/**

- * @brief   Generic 'true' boolean constant.

- */

-#if !defined(TRUE) || defined(__DOXYGEN__)

-#define TRUE                (!FALSE)

-#endif

-/** @} */

-

-/**

- * @name    Kernel types

- * @{

- */

-typedef uint32_t            rtcnt_t;        /**< Realtime counter.          */

-typedef uint64_t            rttime_t;       /**< Realtime accumulator.      */

-typedef uint32_t            syssts_t;       /**< System status word.        */

-typedef uint8_t             tmode_t;        /**< Thread flags.              */

-typedef uint8_t             tstate_t;       /**< Thread state.              */

-typedef uint8_t             trefs_t;        /**< Thread references counter. */

-typedef uint8_t             tslices_t;      /**< Thread time slices counter.*/

-typedef uint32_t            tprio_t;        /**< Thread priority.           */

-typedef int32_t             msg_t;          /**< Inter-thread message.      */

-typedef int32_t             eventid_t;      /**< Numeric event identifier.  */

-typedef uint32_t            eventmask_t;    /**< Mask of event identifiers. */

-typedef uint32_t            eventflags_t;   /**< Mask of event flags.       */

-typedef int32_t             cnt_t;          /**< Generic signed counter.    */

-typedef uint32_t            ucnt_t;         /**< Generic unsigned counter.  */

-/** @} */

-

-/**

- * @brief   ROM constant modifier.

- * @note    It is set to use the "const" keyword in this port.

- */

-#define ROMCONST const

-

-/**

- * @brief   Makes functions not inlineable.

- * @note    If the compiler does not support such attribute then the

- *          realtime counter precision could be degraded.

- */

-#define NOINLINE __attribute__((noinline))

-

-/**

- * @brief   Optimized thread function declaration macro.

- */

-#define PORT_THD_FUNCTION(tname, arg) msg_t tname(void *arg)

-

-/**

- * @brief   Packed variable specifier.

- */

-#define PACKED_VAR __attribute__((packed))

-

-#endif /* _CHTYPES_H_ */

-

-/** @} */