Moved RT version to 6.0, updated all chconf.h files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12106 110e8d01-0319-4d1e-a829-52ad28d1bb01

1 files changed, 89 insertions, 1 deletions

diff --git a/tools/ftl/processors/conf/chconf_rt/chconf.h.ftl b/tools/ftl/processors/conf/chconf_rt/chconf.h.ftl
index 0e0a7a7e9..4b817f3b2 100644
--- a/tools/ftl/processors/conf/chconf_rt/chconf.h.ftl
+++ b/tools/ftl/processors/conf/chconf_rt/chconf.h.ftl
@@ -40,7 +40,7 @@
 #define CHCONF_H

 

 #define _CHIBIOS_RT_CONF_

-#define _CHIBIOS_RT_CONF_VER_5_0_

+#define _CHIBIOS_RT_CONF_VER_6_0_

 

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

 /**

@@ -53,26 +53,34 @@
  * @brief   System time counter resolution.

  * @note    Allowed values are 16 or 32 bits.

  */

+#if !defined(CH_CFG_ST_RESOLUTION)

 #define CH_CFG_ST_RESOLUTION                ${doc.CH_CFG_ST_RESOLUTION!"32"}

+#endif

 

 /**

  * @brief   System tick frequency.

  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

+#if !defined(CH_CFG_ST_FREQUENCY)

 #define CH_CFG_ST_FREQUENCY                 ${doc.CH_CFG_ST_FREQUENCY!"10000"}

+#endif

 

 /**

  * @brief   Time intervals data size.

  * @note    Allowed values are 16, 32 or 64 bits.

  */

+#if !defined(CH_CFG_INTERVALS_SIZE)

 #define CH_CFG_INTERVALS_SIZE               ${doc.CH_CFG_INTERVALS_SIZE!"32"}

+#endif

 

 /**

  * @brief   Time types data size.

  * @note    Allowed values are 16 or 32 bits.

  */

+#if !defined(CH_CFG_TIME_TYPES_SIZE)

 #define CH_CFG_TIME_TYPES_SIZE              ${doc.CH_CFG_TIME_TYPES_SIZE!"32"}

+#endif

 

 /**

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

@@ -82,7 +90,9 @@
  *          The value one is not valid, timeouts are rounded up to

  *          this value.

  */

+#if !defined(CH_CFG_ST_TIMEDELTA)

 #define CH_CFG_ST_TIMEDELTA                 ${doc.CH_CFG_ST_TIMEDELTA!"2"}

+#endif

 

 /** @} */

 

@@ -105,7 +115,9 @@
  * @note    The round robin preemption is not supported in tickless mode and

  *          must be set to zero in that case.

  */

+#if !defined(CH_CFG_TIME_QUANTUM)

 #define CH_CFG_TIME_QUANTUM                 ${doc.CH_CFG_TIME_QUANTUM!"0"}

+#endif

 

 /**

  * @brief   Managed RAM size.

@@ -118,7 +130,9 @@
  *          provide the @p __heap_base__ and @p __heap_end__ symbols.

  * @note    Requires @p CH_CFG_USE_MEMCORE.

  */

+#if !defined(CH_CFG_MEMCORE_SIZE)

 #define CH_CFG_MEMCORE_SIZE                 ${doc.CH_CFG_MEMCORE_SIZE!"0"}

+#endif

 

 /**

  * @brief   Idle thread automatic spawn suppression.

@@ -127,7 +141,9 @@
  *          function becomes the idle thread and must implement an

  *          infinite loop.

  */

+#if !defined(CH_CFG_NO_IDLE_THREAD)

 #define CH_CFG_NO_IDLE_THREAD               ${doc.CH_CFG_NO_IDLE_THREAD!"FALSE"}

+#endif

 

 /** @} */

 

@@ -146,7 +162,9 @@
  * @note    This is not related to the compiler optimization options.

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_OPTIMIZE_SPEED)

 #define CH_CFG_OPTIMIZE_SPEED               ${doc.CH_CFG_OPTIMIZE_SPEED!"TRUE"}

+#endif

 

 /** @} */

 

@@ -164,7 +182,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_TM)

 #define CH_CFG_USE_TM                       ${doc.CH_CFG_USE_TM!"TRUE"}

+#endif

 

 /**

  * @brief   Threads registry APIs.

@@ -172,7 +192,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_REGISTRY)

 #define CH_CFG_USE_REGISTRY                 ${doc.CH_CFG_USE_REGISTRY!"TRUE"}

+#endif

 

 /**

  * @brief   Threads synchronization APIs.

@@ -181,7 +203,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_WAITEXIT)

 #define CH_CFG_USE_WAITEXIT                 ${doc.CH_CFG_USE_WAITEXIT!"TRUE"}

+#endif

 

 /**

  * @brief   Semaphores APIs.

@@ -189,7 +213,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_SEMAPHORES)

 #define CH_CFG_USE_SEMAPHORES               ${doc.CH_CFG_USE_SEMAPHORES!"TRUE"}

+#endif

 

 /**

  * @brief   Semaphores queuing mode.

@@ -200,7 +226,9 @@
  *          requirements.

  * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)

 #define CH_CFG_USE_SEMAPHORES_PRIORITY      ${doc.CH_CFG_USE_SEMAPHORES_PRIORITY!"FALSE"}

+#endif

 

 /**

  * @brief   Mutexes APIs.

@@ -208,7 +236,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MUTEXES)

 #define CH_CFG_USE_MUTEXES                  ${doc.CH_CFG_USE_MUTEXES!"TRUE"}

+#endif

 

 /**

  * @brief   Enables recursive behavior on mutexes.

@@ -218,7 +248,9 @@
  * @note    The default is @p FALSE.

  * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)

 #define CH_CFG_USE_MUTEXES_RECURSIVE        ${doc.CH_CFG_USE_MUTEXES_RECURSIVE!"FALSE"}

+#endif

 

 /**

  * @brief   Conditional Variables APIs.

@@ -228,7 +260,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

+#if !defined(CH_CFG_USE_CONDVARS)

 #define CH_CFG_USE_CONDVARS                 ${doc.CH_CFG_USE_CONDVARS!"TRUE"}

+#endif

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -238,7 +272,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_CONDVARS.

  */

+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)

 #define CH_CFG_USE_CONDVARS_TIMEOUT         ${doc.CH_CFG_USE_CONDVARS_TIMEOUT!"TRUE"}

+#endif

 

 /**

  * @brief   Events Flags APIs.

@@ -246,7 +282,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_EVENTS)

 #define CH_CFG_USE_EVENTS                   ${doc.CH_CFG_USE_EVENTS!"TRUE"}

+#endif

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -256,7 +294,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_EVENTS.

  */

+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)

 #define CH_CFG_USE_EVENTS_TIMEOUT           ${doc.CH_CFG_USE_EVENTS_TIMEOUT!"TRUE"}

+#endif

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -265,7 +305,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MESSAGES)

 #define CH_CFG_USE_MESSAGES                 ${doc.CH_CFG_USE_MESSAGES!"TRUE"}

+#endif

 

 /**

  * @brief   Synchronous Messages queuing mode.

@@ -276,7 +318,9 @@
  *          requirements.

  * @note    Requires @p CH_CFG_USE_MESSAGES.

  */

+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)

 #define CH_CFG_USE_MESSAGES_PRIORITY        ${doc.CH_CFG_USE_MESSAGES_PRIORITY!"FALSE"}

+#endif

 

 /**

  * @brief   Mailboxes APIs.

@@ -286,7 +330,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

+#if !defined(CH_CFG_USE_MAILBOXES)

 #define CH_CFG_USE_MAILBOXES                ${doc.CH_CFG_USE_MAILBOXES!"TRUE"}

+#endif

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -295,7 +341,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MEMCORE)

 #define CH_CFG_USE_MEMCORE                  ${doc.CH_CFG_USE_MEMCORE!"TRUE"}

+#endif

 

 /**

  * @brief   Heap Allocator APIs.

@@ -307,7 +355,9 @@
  *          @p CH_CFG_USE_SEMAPHORES.

  * @note    Mutexes are recommended.

  */

+#if !defined(CH_CFG_USE_HEAP)

 #define CH_CFG_USE_HEAP                     ${doc.CH_CFG_USE_HEAP!"TRUE"}

+#endif

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -316,7 +366,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MEMPOOLS)

 #define CH_CFG_USE_MEMPOOLS                 ${doc.CH_CFG_USE_MEMPOOLS!"TRUE"}

+#endif

 

 /**

  * @brief  Objects FIFOs APIs.

@@ -325,7 +377,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_OBJ_FIFOS)

 #define CH_CFG_USE_OBJ_FIFOS                ${doc.CH_CFG_USE_OBJ_FIFOS!"TRUE"}

+#endif

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -336,7 +390,9 @@
  * @note    Requires @p CH_CFG_USE_WAITEXIT.

  * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.

  */

+#if !defined(CH_CFG_USE_DYNAMIC)

 #define CH_CFG_USE_DYNAMIC                  ${doc.CH_CFG_USE_DYNAMIC!"TRUE"}

+#endif

 

 /** @} */

 

@@ -354,39 +410,53 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_CFG_USE_FACTORY)

 #define CH_CFG_USE_FACTORY                  ${doc.CH_CFG_USE_FACTORY!"TRUE"}

+#endif

 

 /**

  * @brief   Maximum length for object names.

  * @details If the specified length is zero then the name is stored by

  *          pointer but this could have unintended side effects.

  */

+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)

 #define CH_CFG_FACTORY_MAX_NAMES_LENGTH     ${doc.CH_CFG_FACTORY_MAX_NAMES_LENGTH!"8"}

+#endif

 

 /**

  * @brief   Enables the registry of generic objects.

  */

+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)

 #define CH_CFG_FACTORY_OBJECTS_REGISTRY     ${doc.CH_CFG_FACTORY_OBJECTS_REGISTRY!"TRUE"}

+#endif

 

 /**

  * @brief   Enables factory for generic buffers.

  */

+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)

 #define CH_CFG_FACTORY_GENERIC_BUFFERS      ${doc.CH_CFG_FACTORY_GENERIC_BUFFERS!"TRUE"}

+#endif

 

 /**

  * @brief   Enables factory for semaphores.

  */

+#if !defined(CH_CFG_FACTORY_SEMAPHORES)

 #define CH_CFG_FACTORY_SEMAPHORES           ${doc.CH_CFG_FACTORY_SEMAPHORES!"TRUE"}

+#endif

 

 /**

  * @brief   Enables factory for mailboxes.

  */

+#if !defined(CH_CFG_FACTORY_MAILBOXES)

 #define CH_CFG_FACTORY_MAILBOXES            ${doc.CH_CFG_FACTORY_MAILBOXES!"TRUE"}

+#endif

 

 /**

  * @brief   Enables factory for objects FIFOs.

  */

+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)

 #define CH_CFG_FACTORY_OBJ_FIFOS            ${doc.CH_CFG_FACTORY_OBJ_FIFOS!"TRUE"}

+#endif

 

 /** @} */

 

@@ -402,7 +472,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_STATISTICS)

 #define CH_DBG_STATISTICS                   ${doc.CH_DBG_STATISTICS!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, system state check.

@@ -411,7 +483,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)

 #define CH_DBG_SYSTEM_STATE_CHECK           ${doc.CH_DBG_SYSTEM_STATE_CHECK!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, parameters checks.

@@ -420,7 +494,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_ENABLE_CHECKS)

 #define CH_DBG_ENABLE_CHECKS                ${doc.CH_DBG_ENABLE_CHECKS!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, consistency checks.

@@ -430,7 +506,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_ENABLE_ASSERTS)

 #define CH_DBG_ENABLE_ASSERTS               ${doc.CH_DBG_ENABLE_ASSERTS!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, trace buffer.

@@ -438,14 +516,18 @@
  *

  * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.

  */

+#if !defined(CH_DBG_TRACE_MASK)

 #define CH_DBG_TRACE_MASK                   ${doc.CH_DBG_TRACE_MASK!"CH_DBG_TRACE_MASK_DISABLED"}

+#endif

 

 /**

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

  */

+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)

 #define CH_DBG_TRACE_BUFFER_SIZE            ${doc.CH_DBG_TRACE_BUFFER_SIZE!"128"}

+#endif

 

 /**

  * @brief   Debug option, stack checks.

@@ -457,7 +539,9 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

+#if !defined(CH_DBG_ENABLE_STACK_CHECK)

 #define CH_DBG_ENABLE_STACK_CHECK           ${doc.CH_DBG_ENABLE_STACK_CHECK!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -467,7 +551,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_FILL_THREADS)

 #define CH_DBG_FILL_THREADS                 ${doc.CH_DBG_FILL_THREADS!"FALSE"}

+#endif

 

 /**

  * @brief   Debug option, threads profiling.

@@ -478,7 +564,9 @@
  * @note    This debug option is not currently compatible with the

  *          tickless mode.

  */

+#if !defined(CH_DBG_THREADS_PROFILING)

 #define CH_DBG_THREADS_PROFILING            ${doc.CH_DBG_THREADS_PROFILING!"FALSE"}

+#endif

 

 /** @} */