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

5 files changed, 173 insertions, 146 deletions

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/.project b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
index 20074f5a7..bb34822a3 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F4_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F4_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
index 1ed33ade1..fa1a6b8a0 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
@@ -65,11 +65,12 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../..

-include $(CHIBIOS)/boards/ST_STM32F4_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

+include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk

 include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -82,12 +83,10 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       usbcfg.c main.c

+       main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -117,7 +116,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

@@ -211,8 +210,10 @@ ULIBS =
 ifeq ($(USE_FPU),yes)

   USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

   DDEFS += -DCORTEX_USE_FPU=TRUE

+  DADEFS += -DCORTEX_USE_FPU=TRUE

 else

   DDEFS += -DCORTEX_USE_FPU=FALSE

+  DADEFS += -DCORTEX_USE_FPU=FALSE

 endif

 

 ifeq ($(USE_FWLIB),yes)

@@ -222,4 +223,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
index f943ea80c..2efd81b54 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
@@ -40,8 +40,29 @@
  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

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

-#define CH_FREQUENCY                    1000

+#if !defined(CH_CFG_ST_FREQUENCY) || defined(__DOXYGEN__)

+#define CH_CFG_ST_FREQUENCY                 10000

+#endif

+

+/**

+ * @brief   Realtime Counter frequency.

+ * @details Frequency of the system counter used for realtime delays and

+ *          measurements.

+ */

+#if !defined(CH_CFG_RTC_FREQUENCY) || defined(__DOXYGEN__)

+#define CH_CFG_RTC_FREQUENCY                72000000

+#endif

+

+/**

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

+ * @note    If this value is zero then the system uses the classic

+ *          periodic tick. This value represents the minimum number

+ *          of ticks that is safe to specify in a timeout directive.

+ *          The value one is not valid, timeouts are rounded up to

+ *          this value.

+ */

+#if !defined(CH_CFG_TIMEDELTA) || defined(__DOXYGEN__)

+#define CH_CFG_TIMEDELTA                    2

 #endif

 

 /**

@@ -51,12 +72,13 @@
  *          disables the preemption for threads with equal priority and the

  *          round robin becomes cooperative. Note that higher priority

  *          threads can still preempt, the kernel is always preemptive.

- *

  * @note    Disabling the round robin preemption makes the kernel more compact

  *          and generally faster.

+ * @note    The round robin preemption is not supported in tickless mode and

+ *          must be set to zero in that case.

  */

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

-#define CH_TIME_QUANTUM                 20

+#if !defined(CH_CFG_TIME_QUANTUM) || defined(__DOXYGEN__)

+#define CH_CFG_TIME_QUANTUM                 0

 #endif

 

 /**

@@ -68,27 +90,20 @@
  *

  * @note    In order to let the OS manage the whole RAM the linker script must

  *          provide the @p __heap_base__ and @p __heap_end__ symbols.

- * @note    Requires @p CH_USE_MEMCORE.

+ * @note    Requires @p CH_CFG_USE_MEMCORE.

  */

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

-#define CH_MEMCORE_SIZE                 0

+#if !defined(CH_CFG_MEMCORE_SIZE) || defined(__DOXYGEN__)

+#define CH_CFG_MEMCORE_SIZE                 0

 #endif

 

 /**

  * @brief   Idle thread automatic spawn suppression.

  * @details When this option is activated the function @p chSysInit()

- *          does not spawn the idle thread automatically. The application has

- *          then the responsibility to do one of the following:

- *          - Spawn a custom idle thread at priority @p IDLEPRIO.

- *          - Change the main() thread priority to @p IDLEPRIO then enter

- *            an endless loop. In this scenario the @p main() thread acts as

- *            the idle thread.

- *          .

- * @note    Unless an idle thread is spawned the @p main() thread must not

- *          enter a sleep state.

- */

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

-#define CH_NO_IDLE_THREAD               FALSE

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#if !defined(CH_CFG_NO_IDLE_THREAD) || defined(__DOXYGEN__)

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 #endif

 

 /** @} */

@@ -108,8 +123,8 @@
  * @note    This is not related to the compiler optimization options.

  * @note    The default is @p TRUE.

  */

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

-#define CH_OPTIMIZE_SPEED               TRUE

+#if !defined(CH_CFG_OPTIMIZE_SPEED) || defined(__DOXYGEN__)

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 #endif

 

 /** @} */

@@ -122,13 +137,24 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#if !defined(CH_CFG_USE_TM) || defined(__DOXYGEN__)

+#define CH_CFG_USE_TM                       TRUE

+#endif

+

+/**

  * @brief   Threads registry APIs.

  * @details If enabled then the registry APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_REGISTRY                 TRUE

+#if !defined(CH_CFG_USE_REGISTRY) || defined(__DOXYGEN__)

+#define CH_CFG_USE_REGISTRY                 TRUE

 #endif

 

 /**

@@ -138,8 +164,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_WAITEXIT                 TRUE

+#if !defined(CH_CFG_USE_WAITEXIT) || defined(__DOXYGEN__)

+#define CH_CFG_USE_WAITEXIT                 TRUE

 #endif

 

 /**

@@ -148,8 +174,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_SEMAPHORES               TRUE

+#if !defined(CH_CFG_USE_SEMAPHORES) || defined(__DOXYGEN__)

+#define CH_CFG_USE_SEMAPHORES               TRUE

 #endif

 

 /**

@@ -157,23 +183,12 @@
  * @details If enabled then the threads are enqueued on semaphores by

  *          priority rather than in FIFO order.

  *

- * @note    The default is @p FALSE. Enable this if you have special requirements.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

-

-/**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

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

-#define CH_USE_SEMSW                    TRUE

+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 #endif

 

 /**

@@ -182,8 +197,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_MUTEXES                  TRUE

+#if !defined(CH_CFG_USE_MUTEXES) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MUTEXES                  TRUE

 #endif

 

 /**

@@ -192,10 +207,10 @@
  *          in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

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

-#define CH_USE_CONDVARS                 TRUE

+#if !defined(CH_CFG_USE_CONDVARS) || defined(__DOXYGEN__)

+#define CH_CFG_USE_CONDVARS                 TRUE

 #endif

 

 /**

@@ -204,10 +219,10 @@
  *          specification are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

+ * @note    Requires @p CH_CFG_USE_CONDVARS.

  */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 #endif

 

 /**

@@ -216,8 +231,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_EVENTS                   TRUE

+#if !defined(CH_CFG_USE_EVENTS) || defined(__DOXYGEN__)

+#define CH_CFG_USE_EVENTS                   TRUE

 #endif

 

 /**

@@ -226,10 +241,10 @@
  *          are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

+ * @note    Requires @p CH_CFG_USE_EVENTS.

  */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 #endif

 

 /**

@@ -239,8 +254,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_MESSAGES                 TRUE

+#if !defined(CH_CFG_USE_MESSAGES) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MESSAGES                 TRUE

 #endif

 

 /**

@@ -248,11 +263,12 @@
  * @details If enabled then messages are served by priority rather than in

  *          FIFO order.

  *

- * @note    The default is @p FALSE. Enable this if you have special requirements.

- * @note    Requires @p CH_USE_MESSAGES.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_MESSAGES.

  */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 #endif

 

 /**

@@ -261,10 +277,10 @@
  *          included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

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

-#define CH_USE_MAILBOXES                TRUE

+#if !defined(CH_CFG_USE_MAILBOXES) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MAILBOXES                TRUE

 #endif

 

 /**

@@ -273,8 +289,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_QUEUES                   TRUE

+#if !defined(CH_CFG_USE_QUEUES) || defined(__DOXYGEN__)

+#define CH_CFG_USE_QUEUES                   TRUE

 #endif

 

 /**

@@ -284,8 +300,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_MEMCORE                  TRUE

+#if !defined(CH_CFG_USE_MEMCORE) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MEMCORE                  TRUE

 #endif

 

 /**

@@ -294,26 +310,12 @@
  *          in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MEMCORE and either @p CH_USE_MUTEXES or

- *          @p CH_USE_SEMAPHORES.

+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or

+ *          @p CH_CFG_USE_SEMAPHORES.

  * @note    Mutexes are recommended.

  */

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

-#define CH_USE_HEAP                     TRUE

-#endif

-

-/**

- * @brief   C-runtime allocator.

- * @details If enabled the the heap allocator APIs just wrap the C-runtime

- *          @p malloc() and @p free() functions.

- *

- * @note    The default is @p FALSE.

- * @note    Requires @p CH_USE_HEAP.

- * @note    The C-runtime may or may not require @p CH_USE_MEMCORE, see the

- *          appropriate documentation.

- */

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

-#define CH_USE_MALLOC_HEAP              FALSE

+#if !defined(CH_CFG_USE_HEAP) || defined(__DOXYGEN__)

+#define CH_CFG_USE_HEAP                     TRUE

 #endif

 

 /**

@@ -323,8 +325,8 @@
  *

  * @note    The default is @p TRUE.

  */

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

-#define CH_USE_MEMPOOLS                 TRUE

+#if !defined(CH_CFG_USE_MEMPOOLS) || defined(__DOXYGEN__)

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 #endif

 

 /**

@@ -333,11 +335,11 @@
  *          in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_WAITEXIT.

- * @note    Requires @p CH_USE_HEAP and/or @p CH_USE_MEMPOOLS.

+ * @note    Requires @p CH_CFG_USE_WAITEXIT.

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

  */

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

-#define CH_USE_DYNAMIC                  TRUE

+#if !defined(CH_CFG_USE_DYNAMIC) || defined(__DOXYGEN__)

+#define CH_CFG_USE_DYNAMIC                  TRUE

 #endif

 

 /** @} */

@@ -350,6 +352,15 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#if !defined(CH_DBG_STATISTICS) || defined(__DOXYGEN__)

+#define CH_DBG_STATISTICS                   FALSE

+#endif

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

@@ -357,7 +368,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 #endif

 

 /**

@@ -368,7 +379,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

+#define CH_DBG_ENABLE_CHECKS                FALSE

 #endif

 

 /**

@@ -380,7 +391,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 #endif

 

 /**

@@ -391,7 +402,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

+#define CH_DBG_ENABLE_TRACE                 FALSE

 #endif

 

 /**

@@ -405,7 +416,7 @@
  *          @p panic_msg variable set to @p NULL.

  */

 #if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 #endif

 

 /**

@@ -417,20 +428,20 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

+#define CH_DBG_FILL_THREADS                 FALSE

 #endif

 

 /**

  * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread structure that

+ * @details If enabled then a field is added to the @p thread_t structure that

  *          counts the system ticks occurred while executing the thread.

  *

- * @note    The default is @p TRUE.

- * @note    This debug option is defaulted to TRUE because it is required by

- *          some test cases into the test suite.

+ * @note    The default is @p FALSE.

+ * @note    This debug option is not currently compatible with the

+ *          tickless mode.

  */

 #if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

+#define CH_DBG_THREADS_PROFILING            FALSE

 #endif

 

 /** @} */

@@ -444,10 +455,10 @@
 

 /**

  * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

+ * @details User fields added to the end of the @p thread_t structure.

  */

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

-#define THREAD_EXT_FIELDS                                                   \

+#if !defined(CH_CFG_THREAD_EXTRA_FIELDS) || defined(__DOXYGEN__)

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

 #endif

 

@@ -458,8 +469,8 @@
  * @note    It is invoked from within @p chThdInit() and implicitly from all

  *          the threads creation APIs.

  */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

+#if !defined(CH_CFG_THREAD_INIT_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

 #endif

@@ -472,8 +483,8 @@
  * @note    It is also invoked when the threads simply return in order to

  *          terminate.

  */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

+#if !defined(CH_CFG_THREAD_EXIT_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

 #endif

@@ -482,18 +493,40 @@
  * @brief   Context switch hook.

  * @details This hook is invoked just before switching between threads.

  */

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

-#define THREAD_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

+#if !defined(CH_CFG_CONTEXT_SWITCH_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

   /* System halt code here.*/                                               \

 }

 #endif

 

 /**

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

+ */

+#if !defined(CH_CFG_IDLE_ENTER_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+#endif

+

+/**

+ * @brief   Idle thread leave 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 deactivate a power saving mode.

+ */

+#if !defined(CH_CFG_IDLE_LEAVE_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

+#endif

+

+/**

  * @brief   Idle Loop hook.

  * @details This hook is continuously invoked by the idle thread loop.

  */

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

-#define IDLE_LOOP_HOOK() {                                                  \

+#if !defined(CH_CFG_IDLE_LOOP_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

 #endif

@@ -503,8 +536,8 @@
  * @details This hook is invoked in the system tick handler immediately

  *          after processing the virtual timers queue.

  */

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

-#define SYSTEM_TICK_EVENT_HOOK() {                                          \

+#if !defined(CH_CFG_SYSTEM_TICK_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

 #endif

@@ -514,8 +547,8 @@
  * @details This hook is invoked in case to a system halting error before

  *          the system is halted.

  */

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

-#define SYSTEM_HALT_HOOK() {                                                \

+#if !defined(CH_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__)

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

 #endif

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
index 5351803c1..d63d30523 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
@@ -31,13 +31,6 @@
 #include "mcuconf.h"

 

 /**

- * @brief   Enables the TM subsystem.

- */

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

-#define HAL_USE_TM                  FALSE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -104,7 +97,7 @@
  * @brief   Enables the PWM subsystem.

  */

 #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

+#define HAL_USE_PWM                 FALSE

 #endif

 

 /**

@@ -132,14 +125,14 @@
  * @brief   Enables the SERIAL over USB subsystem.

  */

 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          TRUE

+#define HAL_USE_SERIAL_USB          FALSE

 #endif

 

 /**

  * @brief   Enables the SPI subsystem.

  */

 #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

+#define HAL_USE_SPI                 FALSE

 #endif

 

 /**

@@ -153,7 +146,7 @@
  * @brief   Enables the USB subsystem.

  */

 #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 TRUE

+#define HAL_USE_USB                 FALSE

 #endif

 

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

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
index ac16f2ccd..e05505cd2 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
@@ -49,7 +49,7 @@ static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
 }

 

 static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {

-  static const char *states[] = {THD_STATE_NAMES};

+  static const char *states[] = {CH_THD_STATE_NAMES};

   Thread *tp;

 

   (void)argv;

@@ -61,9 +61,9 @@ static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
   tp = chRegFirstThread();

   do {

     chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",

-            (uint32_t)tp, (uint32_t)tp->p_ctx.r13,

-            (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),

-            states[tp->p_state], (uint32_t)tp->p_time);

+             (uint32_t)tp, (uint32_t)tp->p_ctx.r13,

+             (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),

+             states[tp->p_state], (uint32_t)tp->p_time);

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }