658 files changed, 12527 insertions, 85653 deletions

diff --git a/testhal/AVR/ADC/chconf.h b/testhal/AVR/ADC/chconf.h
deleted file mode 100644
index bf98adae4..000000000
--- a/testhal/AVR/ADC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1250

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_MEMCORE_SIZE                 128

-#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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  FALSE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

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

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @note    It is invoked from within @p chThdInit() and implicitily from all

- *          the threads creation APIs.

- */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/ADC/halconf.h b/testhal/AVR/ADC/halconf.h
deleted file mode 100644
index 5f1babc91..000000000
--- a/testhal/AVR/ADC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 TRUE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      9600

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/ADC/main.c b/testhal/AVR/ADC/main.c
deleted file mode 100644
index 1cb07693f..000000000
--- a/testhal/AVR/ADC/main.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

-

-

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the serial driver 1 using the driver default configuration.

-   */

-  

-  palSetPadMode(IOPORT2, 0, PAL_MODE_OUTPUT_PUSHPULL);

-  

-  sdStart(&SD1, NULL);

-

-  #define ADC_GRP1_NUM_CHANNELS   3

-  #define ADC_GRP1_BUF_DEPTH      10

-    DDRD |= _BV(DDD5);  

-    

-  static adcsample_t samples[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH];

-  static const ADCConversionGroup adcgrpcfg = {

-    FALSE,

-    ADC_GRP1_NUM_CHANNELS,

-    NULL,

-    0b00000111                        /*   enabled channels                */

-  };

-

-  ADCConfig adccfg = {

-    ANALOG_REFERENCE_AVCC /* use the AVCC pin as the ADC reference voltage */

-  };

-

-  adcStart(&ADCD1, &adccfg);

-  

-  palSetGroupMode(IOPORTADC, 0b00000111, 0, PAL_MODE_INPUT_PULLUP);

-  

-

-  while(TRUE)

-  {

-	int i;

-    adcConvert(&ADCD1, &adcgrpcfg, samples, ADC_GRP1_BUF_DEPTH);

-      

-    chprintf((BaseSequentialStream *) &SD1,"Result:\r\n");

-    for(i=0; i < (ADC_GRP1_BUF_DEPTH * ADC_GRP1_NUM_CHANNELS); i++) {

-      if((i % ADC_GRP1_NUM_CHANNELS) == 0) chprintf((BaseSequentialStream *) &SD1,"\r\n");

-      chprintf((BaseSequentialStream *) &SD1," %d", samples[i]);

-    }

-     

-    chprintf((BaseSequentialStream *) &SD1,"\r\n");

-    chThdSleepMilliseconds(500);

-	palTogglePad(IOPORT2, PORTB_LED1);

-  }

-}

diff --git a/testhal/AVR/ADC/mcuconf.h b/testhal/AVR/ADC/mcuconf.h
deleted file mode 100644
index 8d8bd683e..000000000
--- a/testhal/AVR/ADC/mcuconf.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * AVR drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-/*

- * ADC driver system settings.

- */

-

-#define AVR_ADC_USE_ADC1        TRUE

-

-/*

- * CAN driver system settings.

- */

-

-/*

- * MAC driver system settings.

- */

-

-/*

- * PWM driver system settings.

- */

-

-/*

- * SERIAL driver system settings.

- */

-#define AVR_SERIAL_USE_USART0   TRUE

-#define AVR_SERIAL_USE_USART1   FALSE

-

-/*

- * SPI driver system settings.

- */

diff --git a/testhal/AVR/ADC/readme.txt b/testhal/AVR/ADC/readme.txt
deleted file mode 100644
index 2a1524da7..000000000
--- a/testhal/AVR/ADC/readme.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT port for Atmel AVR ATmega1280.                                **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Arduino Mega board.

-

-** The Demo **

-

-The demo currently just prints the TestThread output on Serial0, which is

-available on the board USB connector (FT232 converter), and toggles the LED

-on PB7 (pin 13 on Arduino IDE) every second.

-

-** Build Procedure **

-

-The demo was built using the GCC AVR toolchain. It should build with WinAVR too!

-

-** Notes **

-

-This demo runs natively so the Arduino bootloader must be removed and the FUSEs

-reprogrammed. The values used for fuses are LFUSE=0xe7 and HFUSE=0x99.

diff --git a/testhal/AVR/GPT/Makefile b/testhal/AVR/GPT/Makefile
deleted file mode 100644
index 680f60a32..000000000
--- a/testhal/AVR/GPT/Makefile
+++ /dev/null
@@ -1,630 +0,0 @@
-# Hey Emacs, this is a -*- makefile -*-

-#----------------------------------------------------------------------------

-# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.

-#

-# Released to the Public Domain

-#

-# Additional material for this makefile was written by:

-# Peter Fleury

-# Tim Henigan

-# Colin O'Flynn

-# Reiner Patommel

-# Markus Pfaff

-# Sander Pool

-# Frederik Rouleau

-# Carlos Lamas

-#

-#----------------------------------------------------------------------------

-# On command line:

-#

-# make all = Make software.

-#

-# make clean = Clean out built project files.

-#

-# make coff = Convert ELF to AVR COFF.

-#

-# make extcoff = Convert ELF to AVR Extended COFF.

-#

-# make program = Download the hex file to the device, using avrdude.

-#                Please customize the avrdude settings below first!

-#

-# make debug = Start either simulavr or avarice as specified for debugging,

-#              with avr-gdb or avr-insight as the front end for debugging.

-#

-# make filename.s = Just compile filename.c into the assembler code only.

-#

-# make filename.i = Create a preprocessed source file for use in submitting

-#                   bug reports to the GCC project.

-#

-# To rebuild project do "make clean" then "make all".

-#----------------------------------------------------------------------------

-

-

-# MCU name

-MCU = atmega1280

-

-

-# Processor frequency.

-F_CPU = 16000000

-

-

-# Output format. (can be srec, ihex, binary)

-FORMAT = ihex

-

-

-# Target file name (without extension).

-TARGET = ch

-

-

-# Object files directory

-#     To put object files in current directory, use a dot (.), do NOT make

-#     this an empty or blank macro!

-OBJDIR = .

-

-

-# Imported source files

-CHIBIOS = ../../..

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

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

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

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

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

-#include $(CHIBIOS)/test/test.mk

-

-# List C source files here. (C dependencies are automatically generated.)

-SRC = $(PORTSRC) \

-      $(KERNSRC) \

-      $(TESTSRC) \

-      $(HALSRC) \

-      $(PLATFORMSRC) \

-      $(BOARDSRC) \

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

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

-      main.c

-

-

-# List C++ source files here. (C dependencies are automatically generated.)

-CPPSRC =

-

-

-# List Assembler source files here.

-#     Make them always end in a capital .S.  Files ending in a lowercase .s

-#     will not be considered source files but generated files (assembler

-#     output from the compiler), and will be deleted upon "make clean"!

-#     Even though the DOS/Win* filesystem matches both .s and .S the same,

-#     it will preserve the spelling of the filenames, and gcc itself does

-#     care about how the name is spelled on its command-line.

-ASRC =

-

-

-# Optimization level, can be [0, 1, 2, 3, s].

-#     0 = turn off optimization. s = optimize for size.

-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = 2

-

-

-# Debugging format.

-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.

-#     AVR Studio 4.10 requires dwarf-2.

-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.

-DEBUG = dwarf-2

-

-

-# List any extra directories to look for include files here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-               $(CHIBIOS)/os/various

-

-

-# Compiler flag to set the C Standard level.

-#     c89   = "ANSI" C

-#     gnu89 = c89 plus GCC extensions

-#     c99   = ISO C99 standard (not yet fully implemented)

-#     gnu99 = c99 plus GCC extensions

-CSTANDARD = -std=gnu99

-

-

-# Place -D or -U options here for C sources

-CDEFS = -DF_CPU=$(F_CPU)UL

-

-

-# Place -D or -U options here for ASM sources

-ADEFS = -DF_CPU=$(F_CPU)

-

-

-# Place -D or -U options here for C++ sources

-CPPDEFS = -DF_CPU=$(F_CPU)UL

-#CPPDEFS += -D__STDC_LIMIT_MACROS

-#CPPDEFS += -D__STDC_CONSTANT_MACROS

-

-

-

-#---------------- Compiler Options C ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CFLAGS = -g$(DEBUG)

-CFLAGS += $(CDEFS)

-CFLAGS += -O$(OPT)

-CFLAGS += -funsigned-char

-CFLAGS += -funsigned-bitfields

-CFLAGS += -fpack-struct

-CFLAGS += -fshort-enums

-#CFLAGS += -fno-strict-aliasing

-CFLAGS += -Wall

-CFLAGS += -Wstrict-prototypes

-#CFLAGS += -mshort-calls

-#CFLAGS += -fno-unit-at-a-time

-#CFLAGS += -Wundef

-#CFLAGS += -Wunreachable-code

-#CFLAGS += -Wsign-compare

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-CFLAGS += $(CSTANDARD)

-

-

-#---------------- Compiler Options C++ ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CPPFLAGS = -g$(DEBUG)

-CPPFLAGS += $(CPPDEFS)

-CPPFLAGS += -O$(OPT)

-CPPFLAGS += -funsigned-char

-CPPFLAGS += -funsigned-bitfields

-CPPFLAGS += -fpack-struct

-CPPFLAGS += -fshort-enums

-CPPFLAGS += -fno-exceptions

-CPPFLAGS += -Wall

-CFLAGS += -Wundef

-#CPPFLAGS += -mshort-calls

-#CPPFLAGS += -fno-unit-at-a-time

-#CPPFLAGS += -Wstrict-prototypes

-#CPPFLAGS += -Wunreachable-code

-#CPPFLAGS += -Wsign-compare

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

-CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-#CPPFLAGS += $(CSTANDARD)

-

-

-#---------------- Assembler Options ----------------

-#  -Wa,...:   tell GCC to pass this to the assembler.

-#  -adhlns:   create listing

-#  -gstabs:   have the assembler create line number information; note that

-#             for use in COFF files, additional information about filenames

-#             and function names needs to be present in the assembler source

-#             files -- see avr-libc docs [FIXME: not yet described there]

-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex

-#       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

-

-

-#---------------- Library Options ----------------

-# Minimalistic printf version

-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min

-

-# Floating point printf version (requires MATH_LIB = -lm below)

-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt

-

-# If this is left blank, then it will use the Standard printf version.

-PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)

-

-

-# Minimalistic scanf version

-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min

-

-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)

-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt

-

-# If this is left blank, then it will use the Standard scanf version.

-SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_FLOAT)

-

-

-MATH_LIB = -lm

-

-

-# List any extra directories to look for libraries here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRALIBDIRS =

-

-

-

-#---------------- External Memory Options ----------------

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# used for variables (.data/.bss) and heap (malloc()).

-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# only used for heap (malloc()).

-#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff

-

-EXTMEMOPTS =

-

-

-

-#---------------- Linker Options ----------------

-#  -Wl,...:     tell GCC to pass this to linker.

-#    -Map:      create map file

-#    --cref:    add cross reference to  map file

-LDFLAGS = -Wl,-Map=$(TARGET).map,--cref

-LDFLAGS += $(EXTMEMOPTS)

-LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))

-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)

-#LDFLAGS += -T linker_script.x

-

-

-

-#---------------- Programming Options (avrdude) ----------------

-

-# Programming hardware: alf avr910 avrisp bascom bsd

-# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500

-#

-# Type: avrdude -c ?

-# to get a full listing.

-#

-AVRDUDE_PROGRAMMER = stk500v2

-

-# com1 = serial port. Use lpt1 to connect to parallel port.

-AVRDUDE_PORT = /dev/ttyACM0    # programmer connected to serial device

-

-AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex

-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep

-

-

-# Uncomment the following if you want avrdude's erase cycle counter.

-# Note that this counter needs to be initialized first using -Yn,

-# see avrdude manual.

-#AVRDUDE_ERASE_COUNTER = -y

-

-# Uncomment the following if you do /not/ wish a verification to be

-# performed after programming the device.

-#AVRDUDE_NO_VERIFY = -V

-

-# Increase verbosity level.  Please use this when submitting bug

-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>

-# to submit bug reports.

-#AVRDUDE_VERBOSE = -v -v

-

-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)

-AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)

-AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)

-AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)

-AVRDUDE_FLAGS += -b 115200

-

-

-#---------------- Debugging Options ----------------

-

-# For simulavr only - target MCU frequency.

-DEBUG_MFREQ = $(F_CPU)

-

-# Set the DEBUG_UI to either gdb or insight.

-# DEBUG_UI = gdb

-DEBUG_UI = insight

-

-# Set the debugging back-end to either avarice, simulavr.

-DEBUG_BACKEND = avarice

-#DEBUG_BACKEND = simulavr

-

-# GDB Init Filename.

-GDBINIT_FILE = __avr_gdbinit

-

-# When using avarice settings for the JTAG

-JTAG_DEV = /dev/com1

-

-# Debugging port used to communicate between GDB / avarice / simulavr.

-DEBUG_PORT = 4242

-

-# Debugging host used to communicate between GDB / avarice / simulavr, normally

-#     just set to localhost unless doing some sort of crazy debugging when

-#     avarice is running on a different computer.

-DEBUG_HOST = localhost

-

-

-

-#============================================================================

-

-

-# Define programs and commands.

-SHELL = sh

-CC = avr-gcc

-OBJCOPY = avr-objcopy

-OBJDUMP = avr-objdump

-SIZE = avr-size

-AR = avr-ar rcs

-NM = avr-nm

-AVRDUDE = avrdude

-REMOVE = rm -f

-REMOVEDIR = rm -rf

-COPY = cp

-WINSHELL = cmd

-

-

-# Define Messages

-# English

-MSG_ERRORS_NONE = Errors: none

-MSG_BEGIN = -------- begin --------

-MSG_END = --------  end  --------

-MSG_SIZE_BEFORE = Size before:

-MSG_SIZE_AFTER = Size after:

-MSG_COFF = Converting to AVR COFF:

-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:

-MSG_FLASH = Creating load file for Flash:

-MSG_EEPROM = Creating load file for EEPROM:

-MSG_EXTENDED_LISTING = Creating Extended Listing:

-MSG_SYMBOL_TABLE = Creating Symbol Table:

-MSG_LINKING = Linking:

-MSG_COMPILING = Compiling C:

-MSG_COMPILING_CPP = Compiling C++:

-MSG_ASSEMBLING = Assembling:

-MSG_CLEANING = Cleaning project:

-MSG_CREATING_LIBRARY = Creating library:

-

-

-

-

-# Define all object files.

-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)

-

-# Define all listing files.

-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)

-

-

-# Compiler flags to generate dependency files.

-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d

-

-

-# Combine all necessary flags and optional flags.

-# Add target processor to flags.

-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)

-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)

-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)

-

-

-

-

-

-# Default target.

-all: begin gccversion sizebefore build sizeafter end

-

-# Change the build target to build a HEX file or a library.

-build: elf hex bin eep lss sym

-#build: lib

-

-

-elf: $(TARGET).elf

-hex: $(TARGET).hex

-bin: $(TARGET).bin

-eep: $(TARGET).eep

-lss: $(TARGET).lss

-sym: $(TARGET).sym

-LIBNAME=lib$(TARGET).a

-lib: $(LIBNAME)

-

-

-

-# Eye candy.

-# AVR Studio 3.x does not check make's exit code but relies on

-# the following magic strings to be generated by the compile job.

-begin:

-	@echo

-	@echo $(MSG_BEGIN)

-

-end:

-	@echo $(MSG_END)

-	@echo

-

-

-# Display size of file.

-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex

-ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf

-

-sizebefore:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-sizeafter:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-

-

-# Display compiler version information.

-gccversion :

-	@$(CC) --version

-

-

-

-# Program the device.

-program: $(TARGET).hex $(TARGET).eep

-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

-

-

-# Generate avr-gdb config/init file which does the following:

-#     define the reset signal, load the target file, connect to target, and set

-#     a breakpoint at main().

-gdb-config:

-	@$(REMOVE) $(GDBINIT_FILE)

-	@echo define reset >> $(GDBINIT_FILE)

-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)

-	@echo end >> $(GDBINIT_FILE)

-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)

-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)

-ifeq ($(DEBUG_BACKEND),simulavr)

-	@echo load  >> $(GDBINIT_FILE)

-endif

-	@echo break main >> $(GDBINIT_FILE)

-

-debug: gdb-config $(TARGET).elf

-ifeq ($(DEBUG_BACKEND), avarice)

-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.

-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \

-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)

-	@$(WINSHELL) /c pause

-

-else

-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \

-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)

-endif

-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)

-

-

-

-

-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.

-COFFCONVERT = $(OBJCOPY) --debugging

-COFFCONVERT += --change-section-address .data-0x800000

-COFFCONVERT += --change-section-address .bss-0x800000

-COFFCONVERT += --change-section-address .noinit-0x800000

-COFFCONVERT += --change-section-address .eeprom-0x810000

-

-

-

-coff: $(TARGET).elf

-	@echo

-	@echo $(MSG_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof

-

-

-extcoff: $(TARGET).elf

-	@echo

-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof

-

-

-

-# Create final output files (.hex, .eep) from ELF output file.

-%.hex: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@

-

-%.bin: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O binary -R .eeprom $< $@

-

-%.eep: %.elf

-	@echo

-	@echo $(MSG_EEPROM) $@

-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \

-	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0

-

-# Create extended listing file from ELF output file.

-%.lss: %.elf

-	@echo

-	@echo $(MSG_EXTENDED_LISTING) $@

-	$(OBJDUMP) -h -S $< > $@

-

-# Create a symbol table from ELF output file.

-%.sym: %.elf

-	@echo

-	@echo $(MSG_SYMBOL_TABLE) $@

-	$(NM) -n $< > $@

-

-

-

-# Create library from object files.

-.SECONDARY : $(TARGET).a

-.PRECIOUS : $(OBJ)

-%.a: $(OBJ)

-	@echo

-	@echo $(MSG_CREATING_LIBRARY) $@

-	$(AR) $@ $(OBJ)

-

-

-# Link: create ELF output file from object files.

-.SECONDARY : $(TARGET).elf

-.PRECIOUS : $(OBJ)

-%.elf: $(OBJ)

-	@echo

-	@echo $(MSG_LINKING) $@

-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)

-

-

-# Compile: create object files from C source files.

-$(OBJDIR)/%.o : %.c

-	@echo

-	@echo $(MSG_COMPILING) $<

-	$(CC) -c $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create object files from C++ source files.

-$(OBJDIR)/%.o : %.cpp

-	@echo

-	@echo $(MSG_COMPILING_CPP) $<

-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C source files.

-%.s : %.c

-	$(CC) -S $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C++ source files.

-%.s : %.cpp

-	$(CC) -S $(ALL_CPPFLAGS) $< -o $@

-

-

-# Assemble: create object files from assembler source files.

-$(OBJDIR)/%.o : %.S

-	@echo

-	@echo $(MSG_ASSEMBLING) $<

-	$(CC) -c $(ALL_ASFLAGS) $< -o $@

-

-

-# Create preprocessed source for use in sending a bug report.

-%.i : %.c

-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@

-

-

-# Target: clean project.

-clean: begin clean_list end

-

-clean_list :

-	@echo

-	@echo $(MSG_CLEANING)

-	$(REMOVE) $(TARGET).hex

-	$(REMOVE) $(TARGET).bin

-	$(REMOVE) $(TARGET).eep

-	$(REMOVE) $(TARGET).cof

-	$(REMOVE) $(TARGET).elf

-	$(REMOVE) $(TARGET).map

-	$(REMOVE) $(TARGET).sym

-	$(REMOVE) $(TARGET).lss

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)

-	$(REMOVE) $(SRC:.c=.s)

-	$(REMOVE) $(SRC:.c=.d)

-	$(REMOVE) $(SRC:.c=.i)

-	$(REMOVEDIR) .dep

-

-

-# Create object files directory

-$(shell mkdir $(OBJDIR) 2>/dev/null)

-

-

-# Include the dependency files.

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

-

-

-# Listing of phony targets.

-.PHONY : all begin finish end sizebefore sizeafter gccversion \

-build elf hex bin eep lss sym coff extcoff \

-clean clean_list program debug gdb-config

-

diff --git a/testhal/AVR/GPT/chconf.h b/testhal/AVR/GPT/chconf.h
deleted file mode 100644
index 24dd87b76..000000000
--- a/testhal/AVR/GPT/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    250

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_MEMCORE_SIZE                 128

-#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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  FALSE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

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

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @note    It is invoked from within @p chThdInit() and implicitily from all

- *          the threads creation APIs.

- */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/GPT/halconf.h b/testhal/AVR/GPT/halconf.h
deleted file mode 100644
index d1b7a4a7e..000000000
--- a/testhal/AVR/GPT/halconf.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Block size for MMC transfers.

- */

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

-#define MMC_SECTOR_SIZE             512

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/**

- * @brief   Number of positive insertion queries before generating the

- *          insertion event.

- */

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

-#define MMC_POLLING_INTERVAL        10

-#endif

-

-/**

- * @brief   Interval, in milliseconds, between insertion queries.

- */

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

-#define MMC_POLLING_DELAY           10

-#endif

-

-/**

- * @brief   Uses the SPI polled API for small data transfers.

- * @details Polled transfers usually improve performance because it

- *          saves two context switches and interrupt servicing. Note

- *          that this option has no effect on large transfers which

- *          are always performed using DMAs/IRQs.

- */

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

-#define MMC_USE_SPI_POLLING         TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intevals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/GPT/mcuconf.h b/testhal/AVR/GPT/mcuconf.h
deleted file mode 100644
index b41750c94..000000000
--- a/testhal/AVR/GPT/mcuconf.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * AVR drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-/*

- * SERIAL driver system settings.

- */

-#define AVR_SERIAL_USE_USART0              TRUE

-

-/*

- * GPT driver system settings.

- */

-

-#define AVR_GPT_USE_TIM1                   TRUE

-#define AVR_GPT_USE_TIM2                   TRUE

diff --git a/testhal/AVR/GPT/readme.txt b/testhal/AVR/GPT/readme.txt
deleted file mode 100644
index 24aadca30..000000000
--- a/testhal/AVR/GPT/readme.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT port for Atmel AVR ATmega1280.                                **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Arduino Mega board.

-

-** The Demo **

-

-This demo creates a continuous timer which expires every 500ms, running a

-callback function that toggles the LED on PB7. It also prints out the values

-of the timer registers on the first serial port.

-

-** Build Procedure **

-

-The demo was built using the GCC AVR toolchain. It should build with WinAVR too!

-

-** Notes **

-

-This demo runs natively so the Arduino bootloader must be removed and the FUSEs

-reprogrammed. The values used for fuses are LFUSE=0xe7 and HFUSE=0x99.

diff --git a/testhal/AVR/ICU/Makefile b/testhal/AVR/ICU/Makefile
deleted file mode 100644
index 5f5bfb71f..000000000
--- a/testhal/AVR/ICU/Makefile
+++ /dev/null
@@ -1,630 +0,0 @@
-# Hey Emacs, this is a -*- makefile -*-

-#----------------------------------------------------------------------------

-# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.

-#

-# Released to the Public Domain

-#

-# Additional material for this makefile was written by:

-# Peter Fleury

-# Tim Henigan

-# Colin O'Flynn

-# Reiner Patommel

-# Markus Pfaff

-# Sander Pool

-# Frederik Rouleau

-# Carlos Lamas

-#

-#----------------------------------------------------------------------------

-# On command line:

-#

-# make all = Make software.

-#

-# make clean = Clean out built project files.

-#

-# make coff = Convert ELF to AVR COFF.

-#

-# make extcoff = Convert ELF to AVR Extended COFF.

-#

-# make program = Download the hex file to the device, using avrdude.

-#                Please customize the avrdude settings below first!

-#

-# make debug = Start either simulavr or avarice as specified for debugging,

-#              with avr-gdb or avr-insight as the front end for debugging.

-#

-# make filename.s = Just compile filename.c into the assembler code only.

-#

-# make filename.i = Create a preprocessed source file for use in submitting

-#                   bug reports to the GCC project.

-#

-# To rebuild project do "make clean" then "make all".

-#----------------------------------------------------------------------------

-

-

-# MCU name

-MCU = atmega1280

-

-

-# Processor frequency.

-F_CPU = 16000000

-

-

-# Output format. (can be srec, ihex, binary)

-FORMAT = ihex

-

-

-# Target file name (without extension).

-TARGET = ch

-

-

-# Object files directory

-#     To put object files in current directory, use a dot (.), do NOT make

-#     this an empty or blank macro!

-OBJDIR = .

-

-

-# Imported source files

-CHIBIOS = ../../..

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

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

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

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

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

-#include $(CHIBIOS)/test/test.mk

-

-# List C source files here. (C dependencies are automatically generated.)

-SRC = $(PORTSRC) \

-      $(KERNSRC) \

-      $(TESTSRC) \

-      $(HALSRC) \

-      $(PLATFORMSRC) \

-      $(BOARDSRC) \

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

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

-      main.c

-

-

-# List C++ source files here. (C dependencies are automatically generated.)

-CPPSRC =

-

-

-# List Assembler source files here.

-#     Make them always end in a capital .S.  Files ending in a lowercase .s

-#     will not be considered source files but generated files (assembler

-#     output from the compiler), and will be deleted upon "make clean"!

-#     Even though the DOS/Win* filesystem matches both .s and .S the same,

-#     it will preserve the spelling of the filenames, and gcc itself does

-#     care about how the name is spelled on its command-line.

-ASRC =

-

-

-# Optimization level, can be [0, 1, 2, 3, s].

-#     0 = turn off optimization. s = optimize for size.

-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = 2

-

-

-# Debugging format.

-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.

-#     AVR Studio 4.10 requires dwarf-2.

-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.

-DEBUG = dwarf-2

-

-

-# List any extra directories to look for include files here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-               $(CHIBIOS)/os/various

-

-

-# Compiler flag to set the C Standard level.

-#     c89   = "ANSI" C

-#     gnu89 = c89 plus GCC extensions

-#     c99   = ISO C99 standard (not yet fully implemented)

-#     gnu99 = c99 plus GCC extensions

-CSTANDARD = -std=gnu99

-

-

-# Place -D or -U options here for C sources

-CDEFS = -DF_CPU=$(F_CPU)UL

-

-

-# Place -D or -U options here for ASM sources

-ADEFS = -DF_CPU=$(F_CPU)

-

-

-# Place -D or -U options here for C++ sources

-CPPDEFS = -DF_CPU=$(F_CPU)UL

-#CPPDEFS += -D__STDC_LIMIT_MACROS

-#CPPDEFS += -D__STDC_CONSTANT_MACROS

-

-

-

-#---------------- Compiler Options C ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CFLAGS = -g$(DEBUG)

-CFLAGS += $(CDEFS)

-CFLAGS += -O$(OPT)

-CFLAGS += -funsigned-char

-CFLAGS += -funsigned-bitfields

-CFLAGS += -fpack-struct

-CFLAGS += -fshort-enums

-#CFLAGS += -fno-strict-aliasing

-CFLAGS += -Wall

-CFLAGS += -Wstrict-prototypes

-#CFLAGS += -mshort-calls

-#CFLAGS += -fno-unit-at-a-time

-#CFLAGS += -Wundef

-#CFLAGS += -Wunreachable-code

-#CFLAGS += -Wsign-compare

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-CFLAGS += $(CSTANDARD)

-

-

-#---------------- Compiler Options C++ ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CPPFLAGS = -g$(DEBUG)

-CPPFLAGS += $(CPPDEFS)

-CPPFLAGS += -O$(OPT)

-CPPFLAGS += -funsigned-char

-CPPFLAGS += -funsigned-bitfields

-CPPFLAGS += -fpack-struct

-CPPFLAGS += -fshort-enums

-CPPFLAGS += -fno-exceptions

-CPPFLAGS += -Wall

-CFLAGS += -Wundef

-#CPPFLAGS += -mshort-calls

-#CPPFLAGS += -fno-unit-at-a-time

-#CPPFLAGS += -Wstrict-prototypes

-#CPPFLAGS += -Wunreachable-code

-#CPPFLAGS += -Wsign-compare

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

-CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-#CPPFLAGS += $(CSTANDARD)

-

-

-#---------------- Assembler Options ----------------

-#  -Wa,...:   tell GCC to pass this to the assembler.

-#  -adhlns:   create listing

-#  -gstabs:   have the assembler create line number information; note that

-#             for use in COFF files, additional information about filenames

-#             and function names needs to be present in the assembler source

-#             files -- see avr-libc docs [FIXME: not yet described there]

-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex

-#       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

-

-

-#---------------- Library Options ----------------

-# Minimalistic printf version

-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min

-

-# Floating point printf version (requires MATH_LIB = -lm below)

-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt

-

-# If this is left blank, then it will use the Standard printf version.

-PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)

-

-

-# Minimalistic scanf version

-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min

-

-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)

-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt

-

-# If this is left blank, then it will use the Standard scanf version.

-SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_FLOAT)

-

-

-MATH_LIB = -lm

-

-

-# List any extra directories to look for libraries here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRALIBDIRS =

-

-

-

-#---------------- External Memory Options ----------------

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# used for variables (.data/.bss) and heap (malloc()).

-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# only used for heap (malloc()).

-#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff

-

-EXTMEMOPTS =

-

-

-

-#---------------- Linker Options ----------------

-#  -Wl,...:     tell GCC to pass this to linker.

-#    -Map:      create map file

-#    --cref:    add cross reference to  map file

-LDFLAGS = -Wl,-Map=$(TARGET).map,--cref

-LDFLAGS += $(EXTMEMOPTS)

-LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))

-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)

-#LDFLAGS += -T linker_script.x

-

-

-

-#---------------- Programming Options (avrdude) ----------------

-

-# Programming hardware: alf avr910 avrisp bascom bsd

-# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500

-#

-# Type: avrdude -c ?

-# to get a full listing.

-#

-AVRDUDE_PROGRAMMER = arduino

-

-# com1 = serial port. Use lpt1 to connect to parallel port.

-AVRDUDE_PORT = /dev/ttyUSB0    # programmer connected to serial device

-

-AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex

-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep

-

-

-# Uncomment the following if you want avrdude's erase cycle counter.

-# Note that this counter needs to be initialized first using -Yn,

-# see avrdude manual.

-#AVRDUDE_ERASE_COUNTER = -y

-

-# Uncomment the following if you do /not/ wish a verification to be

-# performed after programming the device.

-#AVRDUDE_NO_VERIFY = -V

-

-# Increase verbosity level.  Please use this when submitting bug

-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>

-# to submit bug reports.

-#AVRDUDE_VERBOSE = -v -v

-

-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)

-AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)

-AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)

-AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)

-AVRDUDE_FLAGS += -b 57600

-

-

-#---------------- Debugging Options ----------------

-

-# For simulavr only - target MCU frequency.

-DEBUG_MFREQ = $(F_CPU)

-

-# Set the DEBUG_UI to either gdb or insight.

-# DEBUG_UI = gdb

-DEBUG_UI = insight

-

-# Set the debugging back-end to either avarice, simulavr.

-DEBUG_BACKEND = avarice

-#DEBUG_BACKEND = simulavr

-

-# GDB Init Filename.

-GDBINIT_FILE = __avr_gdbinit

-

-# When using avarice settings for the JTAG

-JTAG_DEV = /dev/com1

-

-# Debugging port used to communicate between GDB / avarice / simulavr.

-DEBUG_PORT = 4242

-

-# Debugging host used to communicate between GDB / avarice / simulavr, normally

-#     just set to localhost unless doing some sort of crazy debugging when

-#     avarice is running on a different computer.

-DEBUG_HOST = localhost

-

-

-

-#============================================================================

-

-

-# Define programs and commands.

-SHELL = sh

-CC = avr-gcc

-OBJCOPY = avr-objcopy

-OBJDUMP = avr-objdump

-SIZE = avr-size

-AR = avr-ar rcs

-NM = avr-nm

-AVRDUDE = avrdude

-REMOVE = rm -f

-REMOVEDIR = rm -rf

-COPY = cp

-WINSHELL = cmd

-

-

-# Define Messages

-# English

-MSG_ERRORS_NONE = Errors: none

-MSG_BEGIN = -------- begin --------

-MSG_END = --------  end  --------

-MSG_SIZE_BEFORE = Size before:

-MSG_SIZE_AFTER = Size after:

-MSG_COFF = Converting to AVR COFF:

-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:

-MSG_FLASH = Creating load file for Flash:

-MSG_EEPROM = Creating load file for EEPROM:

-MSG_EXTENDED_LISTING = Creating Extended Listing:

-MSG_SYMBOL_TABLE = Creating Symbol Table:

-MSG_LINKING = Linking:

-MSG_COMPILING = Compiling C:

-MSG_COMPILING_CPP = Compiling C++:

-MSG_ASSEMBLING = Assembling:

-MSG_CLEANING = Cleaning project:

-MSG_CREATING_LIBRARY = Creating library:

-

-

-

-

-# Define all object files.

-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)

-

-# Define all listing files.

-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)

-

-

-# Compiler flags to generate dependency files.

-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d

-

-

-# Combine all necessary flags and optional flags.

-# Add target processor to flags.

-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)

-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)

-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)

-

-

-

-

-

-# Default target.

-all: begin gccversion sizebefore build sizeafter end

-

-# Change the build target to build a HEX file or a library.

-build: elf hex bin eep lss sym

-#build: lib

-

-

-elf: $(TARGET).elf

-hex: $(TARGET).hex

-bin: $(TARGET).bin

-eep: $(TARGET).eep

-lss: $(TARGET).lss

-sym: $(TARGET).sym

-LIBNAME=lib$(TARGET).a

-lib: $(LIBNAME)

-

-

-

-# Eye candy.

-# AVR Studio 3.x does not check make's exit code but relies on

-# the following magic strings to be generated by the compile job.

-begin:

-	@echo

-	@echo $(MSG_BEGIN)

-

-end:

-	@echo $(MSG_END)

-	@echo

-

-

-# Display size of file.

-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex

-ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf

-

-sizebefore:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-sizeafter:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-

-

-# Display compiler version information.

-gccversion :

-	@$(CC) --version

-

-

-

-# Program the device.

-program: $(TARGET).hex $(TARGET).eep

-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

-

-

-# Generate avr-gdb config/init file which does the following:

-#     define the reset signal, load the target file, connect to target, and set

-#     a breakpoint at main().

-gdb-config:

-	@$(REMOVE) $(GDBINIT_FILE)

-	@echo define reset >> $(GDBINIT_FILE)

-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)

-	@echo end >> $(GDBINIT_FILE)

-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)

-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)

-ifeq ($(DEBUG_BACKEND),simulavr)

-	@echo load  >> $(GDBINIT_FILE)

-endif

-	@echo break main >> $(GDBINIT_FILE)

-

-debug: gdb-config $(TARGET).elf

-ifeq ($(DEBUG_BACKEND), avarice)

-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.

-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \

-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)

-	@$(WINSHELL) /c pause

-

-else

-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \

-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)

-endif

-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)

-

-

-

-

-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.

-COFFCONVERT = $(OBJCOPY) --debugging

-COFFCONVERT += --change-section-address .data-0x800000

-COFFCONVERT += --change-section-address .bss-0x800000

-COFFCONVERT += --change-section-address .noinit-0x800000

-COFFCONVERT += --change-section-address .eeprom-0x810000

-

-

-

-coff: $(TARGET).elf

-	@echo

-	@echo $(MSG_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof

-

-

-extcoff: $(TARGET).elf

-	@echo

-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof

-

-

-

-# Create final output files (.hex, .eep) from ELF output file.

-%.hex: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@

-

-%.bin: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O binary -R .eeprom $< $@

-

-%.eep: %.elf

-	@echo

-	@echo $(MSG_EEPROM) $@

-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \

-	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0

-

-# Create extended listing file from ELF output file.

-%.lss: %.elf

-	@echo

-	@echo $(MSG_EXTENDED_LISTING) $@

-	$(OBJDUMP) -h -S $< > $@

-

-# Create a symbol table from ELF output file.

-%.sym: %.elf

-	@echo

-	@echo $(MSG_SYMBOL_TABLE) $@

-	$(NM) -n $< > $@

-

-

-

-# Create library from object files.

-.SECONDARY : $(TARGET).a

-.PRECIOUS : $(OBJ)

-%.a: $(OBJ)

-	@echo

-	@echo $(MSG_CREATING_LIBRARY) $@

-	$(AR) $@ $(OBJ)

-

-

-# Link: create ELF output file from object files.

-.SECONDARY : $(TARGET).elf

-.PRECIOUS : $(OBJ)

-%.elf: $(OBJ)

-	@echo

-	@echo $(MSG_LINKING) $@

-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)

-

-

-# Compile: create object files from C source files.

-$(OBJDIR)/%.o : %.c

-	@echo

-	@echo $(MSG_COMPILING) $<

-	$(CC) -c $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create object files from C++ source files.

-$(OBJDIR)/%.o : %.cpp

-	@echo

-	@echo $(MSG_COMPILING_CPP) $<

-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C source files.

-%.s : %.c

-	$(CC) -S $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C++ source files.

-%.s : %.cpp

-	$(CC) -S $(ALL_CPPFLAGS) $< -o $@

-

-

-# Assemble: create object files from assembler source files.

-$(OBJDIR)/%.o : %.S

-	@echo

-	@echo $(MSG_ASSEMBLING) $<

-	$(CC) -c $(ALL_ASFLAGS) $< -o $@

-

-

-# Create preprocessed source for use in sending a bug report.

-%.i : %.c

-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@

-

-

-# Target: clean project.

-clean: begin clean_list end

-

-clean_list :

-	@echo

-	@echo $(MSG_CLEANING)

-	$(REMOVE) $(TARGET).hex

-	$(REMOVE) $(TARGET).bin

-	$(REMOVE) $(TARGET).eep

-	$(REMOVE) $(TARGET).cof

-	$(REMOVE) $(TARGET).elf

-	$(REMOVE) $(TARGET).map

-	$(REMOVE) $(TARGET).sym

-	$(REMOVE) $(TARGET).lss

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)

-	$(REMOVE) $(SRC:.c=.s)

-	$(REMOVE) $(SRC:.c=.d)

-	$(REMOVE) $(SRC:.c=.i)

-	$(REMOVEDIR) .dep

-

-

-# Create object files directory

-$(shell mkdir $(OBJDIR) 2>/dev/null)

-

-

-# Include the dependency files.

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

-

-

-# Listing of phony targets.

-.PHONY : all begin finish end sizebefore sizeafter gccversion \

-build elf hex bin eep lss sym coff extcoff \

-clean clean_list program debug gdb-config

-

diff --git a/testhal/AVR/ICU/chconf.h b/testhal/AVR/ICU/chconf.h
deleted file mode 100644
index f95f65faa..000000000
--- a/testhal/AVR/ICU/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    AVR/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    250

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_MEMCORE_SIZE                 128

-#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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  FALSE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

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

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @note    It is invoked from within @p chThdInit() and implicitily from all

- *          the threads creation APIs.

- */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/ICU/halconf.h b/testhal/AVR/ICU/halconf.h
deleted file mode 100644
index dd88b74b2..000000000
--- a/testhal/AVR/ICU/halconf.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the DAC subsystem.

- */

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

-#define HAL_USE_DAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Block size for MMC transfers.

- */

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

-#define MMC_SECTOR_SIZE             512

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/**

- * @brief   Number of positive insertion queries before generating the

- *          insertion event.

- */

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

-#define MMC_POLLING_INTERVAL        10

-#endif

-

-/**

- * @brief   Interval, in milliseconds, between insertion queries.

- */

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

-#define MMC_POLLING_DELAY           10

-#endif

-

-/**

- * @brief   Uses the SPI polled API for small data transfers.

- * @details Polled transfers usually improve performance because it

- *          saves two context switches and interrupt servicing. Note

- *          that this option has no effect on large transfers which

- *          are always performed using DMAs/IRQs.

- */

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

-#define MMC_USE_SPI_POLLING         TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intevals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/ICU/main.c b/testhal/AVR/ICU/main.c
deleted file mode 100644
index 80fd04516..000000000
--- a/testhal/AVR/ICU/main.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

-

-#define LED  7

-

-static icucnt_t width = 0;

-static icucnt_t period = 0;

-static Thread *thread1 = NULL;

-static Thread *thread2 = NULL;

-static Thread *thread_main = NULL;

-static const uint32_t ICU_CLK = F_CPU / 1024;

-

-void width_cb(ICUDriver *icup) {

-  width = icup->width;

-}

-

-void period_cb(ICUDriver *icup) {

-  period = icup->period;

-  chSysLockFromIsr();

-  chEvtSignalI(thread1, (eventmask_t) 1);

-  chSysUnlockFromIsr();

-}

-

-void overflow_cb(ICUDriver *icup) {

-  chSysLockFromIsr();

-  chEvtSignalI(thread2, (eventmask_t) 1);

-  chSysUnlockFromIsr();

-}

-

-void output_single_cycle(const uint16_t low, const uint16_t high) {

-  palClearPad(IOPORT2, LED);

-  palClearPad(IOPORT4, 4);

-  chThdSleepMilliseconds(low);

-  palSetPad(IOPORT2, LED);

-  palSetPad(IOPORT4, 4);

-  chThdSleepMilliseconds(high);

-  palClearPad(IOPORT2, LED);

-  palClearPad(IOPORT4, 4);

-}

-

-static WORKING_AREA(waThread1, 64);

-static msg_t Thread1(void *arg) {

-

-  BaseSequentialStream *serp = (BaseSequentialStream *) &SD1;

-  thread1 = chThdSelf();

-  while (TRUE) {

-    chEvtWaitAny((eventmask_t) 1);

-    chprintf(serp, "WIDTH[%lu ms, %u ticks] PERIOD[%lu ms, %u ticks]\r\n",

-                   ((uint32_t) width * 1000) / ICU_CLK,

-                   width,

-                   ((uint32_t) period * 1000) / ICU_CLK,

-                   period);

-    chEvtSignal(thread_main, (eventmask_t) 1);

-  }

-  return 0;

-}

-

-static WORKING_AREA(waThread2, 64);

-static msg_t Thread2(void *arg) {

-

-  BaseSequentialStream *serp = (BaseSequentialStream *) &SD1;

-  thread2 = chThdSelf();

-  while (TRUE) {

-    chEvtWaitAny((eventmask_t) 1);

-    chprintf(serp, "OVERFLOW\r\n");

-    chEvtSignal(thread_main, (eventmask_t) 2);

-  }

-  return 0;

-}

-

-int main(void) {

-

-  halInit();

-  chSysInit();

-

-  static ICUConfig icu3cfg = {

-    ICU_INPUT_ACTIVE_HIGH,

-    0, /* bogus frequency */

-    width_cb,

-    period_cb,

-    overflow_cb,

-  };

-

-  palSetPadMode(IOPORT2, LED, PAL_MODE_OUTPUT_PUSHPULL);

-  palSetPadMode(IOPORT4, 4, PAL_MODE_OUTPUT_PUSHPULL);

-  palClearPad(IOPORT2, LED);

-  palClearPad(IOPORT4, 4);

-

-  sdStart(&SD1, NULL);

-  icuStart(&ICUD3, &icu3cfg);

-

-  thread_main = chThdSelf();

-

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-  chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL);

-

-  while (1) {

-    BaseSequentialStream *serp = (BaseSequentialStream *) &SD1;

-

-    chprintf(serp, "Testing 50 duty cycle\r\n");

-    icuEnable(&ICUD3);

-    output_single_cycle(500, 500);

-    icuDisable(&ICUD3);

-    chEvtWaitAny((eventmask_t) 3);

-

-    chprintf(serp, "Testing 25 duty cycle\r\n");

-    icuEnable(&ICUD3);

-    output_single_cycle(250, 750);

-    icuDisable(&ICUD3);

-    chEvtWaitAny((eventmask_t) 3);

-

-    chprintf(serp, "Testing 75 duty cycle\r\n");

-    icuEnable(&ICUD3);

-    output_single_cycle(750, 250);

-    icuDisable(&ICUD3);

-    chEvtWaitAny((eventmask_t) 3);

-

-    chprintf(serp, "Testing overflow\r\n");

-    icuEnable(&ICUD3);

-    chEvtWaitAny((eventmask_t) 3);

-    icuDisable(&ICUD3);

-  }

-}

diff --git a/testhal/AVR/ICU/mcuconf.h b/testhal/AVR/ICU/mcuconf.h
deleted file mode 100644
index 04fb731b0..000000000
--- a/testhal/AVR/ICU/mcuconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * AVR drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-#define AVR_SERIAL_USE_USART0           TRUE

-#define AVR_ICU_USE_TIM3                TRUE

diff --git a/testhal/AVR/ICU/readme.txt b/testhal/AVR/ICU/readme.txt
deleted file mode 100644
index c9b431083..000000000
--- a/testhal/AVR/ICU/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT port for Atmel AVR ATmega1280.                                **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Arduino Mega board.

-

-** The Demo **

-

-This demo uses ICP3 (ICU3 input) which is located on pin PE7 to measure signal

-width and period. The signal is output on pin PD4 using standard PAL calls and

-thread sleep functions. PD4 must be wired to PE7. It outputs three different

-waveforms with aproximately 1s duration using 50%, 25% and 75% respective duty

-cycles. After that it just turns on ICU3 and waits for it to overflow. The values

-read on each of these operations is output to SERIAL1.

-

-** Build Procedure **

-

-The demo was built using the GCC AVR toolchain. It should build with WinAVR too!

-

-** Notes **

-

-This demo runs natively so the Arduino bootloader must be removed and the FUSEs

-reprogrammed. The values used for fuses are LFUSE=0xe7 and HFUSE=0x99.

diff --git a/testhal/AVR/PWM/Makefile b/testhal/AVR/PWM/Makefile
deleted file mode 100644
index 5f5bfb71f..000000000
--- a/testhal/AVR/PWM/Makefile
+++ /dev/null
@@ -1,630 +0,0 @@
-# Hey Emacs, this is a -*- makefile -*-

-#----------------------------------------------------------------------------

-# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.

-#

-# Released to the Public Domain

-#

-# Additional material for this makefile was written by:

-# Peter Fleury

-# Tim Henigan

-# Colin O'Flynn

-# Reiner Patommel

-# Markus Pfaff

-# Sander Pool

-# Frederik Rouleau

-# Carlos Lamas

-#

-#----------------------------------------------------------------------------

-# On command line:

-#

-# make all = Make software.

-#

-# make clean = Clean out built project files.

-#

-# make coff = Convert ELF to AVR COFF.

-#

-# make extcoff = Convert ELF to AVR Extended COFF.

-#

-# make program = Download the hex file to the device, using avrdude.

-#                Please customize the avrdude settings below first!

-#

-# make debug = Start either simulavr or avarice as specified for debugging,

-#              with avr-gdb or avr-insight as the front end for debugging.

-#

-# make filename.s = Just compile filename.c into the assembler code only.

-#

-# make filename.i = Create a preprocessed source file for use in submitting

-#                   bug reports to the GCC project.

-#

-# To rebuild project do "make clean" then "make all".

-#----------------------------------------------------------------------------

-

-

-# MCU name

-MCU = atmega1280

-

-

-# Processor frequency.

-F_CPU = 16000000

-

-

-# Output format. (can be srec, ihex, binary)

-FORMAT = ihex

-

-

-# Target file name (without extension).

-TARGET = ch

-

-

-# Object files directory

-#     To put object files in current directory, use a dot (.), do NOT make

-#     this an empty or blank macro!

-OBJDIR = .

-

-

-# Imported source files

-CHIBIOS = ../../..

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

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

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

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

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

-#include $(CHIBIOS)/test/test.mk

-

-# List C source files here. (C dependencies are automatically generated.)

-SRC = $(PORTSRC) \

-      $(KERNSRC) \

-      $(TESTSRC) \

-      $(HALSRC) \

-      $(PLATFORMSRC) \

-      $(BOARDSRC) \

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

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

-      main.c

-

-

-# List C++ source files here. (C dependencies are automatically generated.)

-CPPSRC =

-

-

-# List Assembler source files here.

-#     Make them always end in a capital .S.  Files ending in a lowercase .s

-#     will not be considered source files but generated files (assembler

-#     output from the compiler), and will be deleted upon "make clean"!

-#     Even though the DOS/Win* filesystem matches both .s and .S the same,

-#     it will preserve the spelling of the filenames, and gcc itself does

-#     care about how the name is spelled on its command-line.

-ASRC =

-

-

-# Optimization level, can be [0, 1, 2, 3, s].

-#     0 = turn off optimization. s = optimize for size.

-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = 2

-

-

-# Debugging format.

-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.

-#     AVR Studio 4.10 requires dwarf-2.

-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.

-DEBUG = dwarf-2

-

-

-# List any extra directories to look for include files here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-               $(CHIBIOS)/os/various

-

-

-# Compiler flag to set the C Standard level.

-#     c89   = "ANSI" C

-#     gnu89 = c89 plus GCC extensions

-#     c99   = ISO C99 standard (not yet fully implemented)

-#     gnu99 = c99 plus GCC extensions

-CSTANDARD = -std=gnu99

-

-

-# Place -D or -U options here for C sources

-CDEFS = -DF_CPU=$(F_CPU)UL

-

-

-# Place -D or -U options here for ASM sources

-ADEFS = -DF_CPU=$(F_CPU)

-

-

-# Place -D or -U options here for C++ sources

-CPPDEFS = -DF_CPU=$(F_CPU)UL

-#CPPDEFS += -D__STDC_LIMIT_MACROS

-#CPPDEFS += -D__STDC_CONSTANT_MACROS

-

-

-

-#---------------- Compiler Options C ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CFLAGS = -g$(DEBUG)

-CFLAGS += $(CDEFS)

-CFLAGS += -O$(OPT)

-CFLAGS += -funsigned-char

-CFLAGS += -funsigned-bitfields

-CFLAGS += -fpack-struct

-CFLAGS += -fshort-enums

-#CFLAGS += -fno-strict-aliasing

-CFLAGS += -Wall

-CFLAGS += -Wstrict-prototypes

-#CFLAGS += -mshort-calls

-#CFLAGS += -fno-unit-at-a-time

-#CFLAGS += -Wundef

-#CFLAGS += -Wunreachable-code

-#CFLAGS += -Wsign-compare

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-CFLAGS += $(CSTANDARD)

-

-

-#---------------- Compiler Options C++ ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CPPFLAGS = -g$(DEBUG)

-CPPFLAGS += $(CPPDEFS)

-CPPFLAGS += -O$(OPT)

-CPPFLAGS += -funsigned-char

-CPPFLAGS += -funsigned-bitfields

-CPPFLAGS += -fpack-struct

-CPPFLAGS += -fshort-enums

-CPPFLAGS += -fno-exceptions

-CPPFLAGS += -Wall

-CFLAGS += -Wundef

-#CPPFLAGS += -mshort-calls

-#CPPFLAGS += -fno-unit-at-a-time

-#CPPFLAGS += -Wstrict-prototypes

-#CPPFLAGS += -Wunreachable-code

-#CPPFLAGS += -Wsign-compare

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

-CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-#CPPFLAGS += $(CSTANDARD)

-

-

-#---------------- Assembler Options ----------------

-#  -Wa,...:   tell GCC to pass this to the assembler.

-#  -adhlns:   create listing

-#  -gstabs:   have the assembler create line number information; note that

-#             for use in COFF files, additional information about filenames

-#             and function names needs to be present in the assembler source

-#             files -- see avr-libc docs [FIXME: not yet described there]

-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex

-#       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

-

-

-#---------------- Library Options ----------------

-# Minimalistic printf version

-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min

-

-# Floating point printf version (requires MATH_LIB = -lm below)

-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt

-

-# If this is left blank, then it will use the Standard printf version.

-PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)

-

-

-# Minimalistic scanf version

-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min

-

-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)

-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt

-

-# If this is left blank, then it will use the Standard scanf version.

-SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_FLOAT)

-

-

-MATH_LIB = -lm

-

-

-# List any extra directories to look for libraries here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRALIBDIRS =

-

-

-

-#---------------- External Memory Options ----------------

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# used for variables (.data/.bss) and heap (malloc()).

-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# only used for heap (malloc()).

-#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff

-

-EXTMEMOPTS =

-

-

-

-#---------------- Linker Options ----------------

-#  -Wl,...:     tell GCC to pass this to linker.

-#    -Map:      create map file

-#    --cref:    add cross reference to  map file

-LDFLAGS = -Wl,-Map=$(TARGET).map,--cref

-LDFLAGS += $(EXTMEMOPTS)

-LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))

-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)

-#LDFLAGS += -T linker_script.x

-

-

-

-#---------------- Programming Options (avrdude) ----------------

-

-# Programming hardware: alf avr910 avrisp bascom bsd

-# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500

-#

-# Type: avrdude -c ?

-# to get a full listing.

-#

-AVRDUDE_PROGRAMMER = arduino

-

-# com1 = serial port. Use lpt1 to connect to parallel port.

-AVRDUDE_PORT = /dev/ttyUSB0    # programmer connected to serial device

-

-AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex

-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep

-

-

-# Uncomment the following if you want avrdude's erase cycle counter.

-# Note that this counter needs to be initialized first using -Yn,

-# see avrdude manual.

-#AVRDUDE_ERASE_COUNTER = -y

-

-# Uncomment the following if you do /not/ wish a verification to be

-# performed after programming the device.

-#AVRDUDE_NO_VERIFY = -V

-

-# Increase verbosity level.  Please use this when submitting bug

-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>

-# to submit bug reports.

-#AVRDUDE_VERBOSE = -v -v

-

-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)

-AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)

-AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)

-AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)

-AVRDUDE_FLAGS += -b 57600

-

-

-#---------------- Debugging Options ----------------

-

-# For simulavr only - target MCU frequency.

-DEBUG_MFREQ = $(F_CPU)

-

-# Set the DEBUG_UI to either gdb or insight.

-# DEBUG_UI = gdb

-DEBUG_UI = insight

-

-# Set the debugging back-end to either avarice, simulavr.

-DEBUG_BACKEND = avarice

-#DEBUG_BACKEND = simulavr

-

-# GDB Init Filename.

-GDBINIT_FILE = __avr_gdbinit

-

-# When using avarice settings for the JTAG

-JTAG_DEV = /dev/com1

-

-# Debugging port used to communicate between GDB / avarice / simulavr.

-DEBUG_PORT = 4242

-

-# Debugging host used to communicate between GDB / avarice / simulavr, normally

-#     just set to localhost unless doing some sort of crazy debugging when

-#     avarice is running on a different computer.

-DEBUG_HOST = localhost

-

-

-

-#============================================================================

-

-

-# Define programs and commands.

-SHELL = sh

-CC = avr-gcc

-OBJCOPY = avr-objcopy

-OBJDUMP = avr-objdump

-SIZE = avr-size

-AR = avr-ar rcs

-NM = avr-nm

-AVRDUDE = avrdude

-REMOVE = rm -f

-REMOVEDIR = rm -rf

-COPY = cp

-WINSHELL = cmd

-

-

-# Define Messages

-# English

-MSG_ERRORS_NONE = Errors: none

-MSG_BEGIN = -------- begin --------

-MSG_END = --------  end  --------

-MSG_SIZE_BEFORE = Size before:

-MSG_SIZE_AFTER = Size after:

-MSG_COFF = Converting to AVR COFF:

-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:

-MSG_FLASH = Creating load file for Flash:

-MSG_EEPROM = Creating load file for EEPROM:

-MSG_EXTENDED_LISTING = Creating Extended Listing:

-MSG_SYMBOL_TABLE = Creating Symbol Table:

-MSG_LINKING = Linking:

-MSG_COMPILING = Compiling C:

-MSG_COMPILING_CPP = Compiling C++:

-MSG_ASSEMBLING = Assembling:

-MSG_CLEANING = Cleaning project:

-MSG_CREATING_LIBRARY = Creating library:

-

-

-

-

-# Define all object files.

-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)

-

-# Define all listing files.

-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)

-

-

-# Compiler flags to generate dependency files.

-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d

-

-

-# Combine all necessary flags and optional flags.

-# Add target processor to flags.

-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)

-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)

-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)

-

-

-

-

-

-# Default target.

-all: begin gccversion sizebefore build sizeafter end

-

-# Change the build target to build a HEX file or a library.

-build: elf hex bin eep lss sym

-#build: lib

-

-

-elf: $(TARGET).elf

-hex: $(TARGET).hex

-bin: $(TARGET).bin

-eep: $(TARGET).eep

-lss: $(TARGET).lss

-sym: $(TARGET).sym

-LIBNAME=lib$(TARGET).a

-lib: $(LIBNAME)

-

-

-

-# Eye candy.

-# AVR Studio 3.x does not check make's exit code but relies on

-# the following magic strings to be generated by the compile job.

-begin:

-	@echo

-	@echo $(MSG_BEGIN)

-

-end:

-	@echo $(MSG_END)

-	@echo

-

-

-# Display size of file.

-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex

-ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf

-

-sizebefore:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-sizeafter:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-

-

-# Display compiler version information.

-gccversion :

-	@$(CC) --version

-

-

-

-# Program the device.

-program: $(TARGET).hex $(TARGET).eep

-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

-

-

-# Generate avr-gdb config/init file which does the following:

-#     define the reset signal, load the target file, connect to target, and set

-#     a breakpoint at main().

-gdb-config:

-	@$(REMOVE) $(GDBINIT_FILE)

-	@echo define reset >> $(GDBINIT_FILE)

-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)

-	@echo end >> $(GDBINIT_FILE)

-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)

-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)

-ifeq ($(DEBUG_BACKEND),simulavr)

-	@echo load  >> $(GDBINIT_FILE)

-endif

-	@echo break main >> $(GDBINIT_FILE)

-

-debug: gdb-config $(TARGET).elf

-ifeq ($(DEBUG_BACKEND), avarice)

-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.

-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \

-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)

-	@$(WINSHELL) /c pause

-

-else

-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \

-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)

-endif

-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)

-

-

-

-

-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.

-COFFCONVERT = $(OBJCOPY) --debugging

-COFFCONVERT += --change-section-address .data-0x800000

-COFFCONVERT += --change-section-address .bss-0x800000

-COFFCONVERT += --change-section-address .noinit-0x800000

-COFFCONVERT += --change-section-address .eeprom-0x810000

-

-

-

-coff: $(TARGET).elf

-	@echo

-	@echo $(MSG_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof

-

-

-extcoff: $(TARGET).elf

-	@echo

-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof

-

-

-

-# Create final output files (.hex, .eep) from ELF output file.

-%.hex: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@

-

-%.bin: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O binary -R .eeprom $< $@

-

-%.eep: %.elf

-	@echo

-	@echo $(MSG_EEPROM) $@

-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \

-	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0

-

-# Create extended listing file from ELF output file.

-%.lss: %.elf

-	@echo

-	@echo $(MSG_EXTENDED_LISTING) $@

-	$(OBJDUMP) -h -S $< > $@

-

-# Create a symbol table from ELF output file.

-%.sym: %.elf

-	@echo

-	@echo $(MSG_SYMBOL_TABLE) $@

-	$(NM) -n $< > $@

-

-

-

-# Create library from object files.

-.SECONDARY : $(TARGET).a

-.PRECIOUS : $(OBJ)

-%.a: $(OBJ)

-	@echo

-	@echo $(MSG_CREATING_LIBRARY) $@

-	$(AR) $@ $(OBJ)

-

-

-# Link: create ELF output file from object files.

-.SECONDARY : $(TARGET).elf

-.PRECIOUS : $(OBJ)

-%.elf: $(OBJ)

-	@echo

-	@echo $(MSG_LINKING) $@

-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)

-

-

-# Compile: create object files from C source files.

-$(OBJDIR)/%.o : %.c

-	@echo

-	@echo $(MSG_COMPILING) $<

-	$(CC) -c $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create object files from C++ source files.

-$(OBJDIR)/%.o : %.cpp

-	@echo

-	@echo $(MSG_COMPILING_CPP) $<

-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C source files.

-%.s : %.c

-	$(CC) -S $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C++ source files.

-%.s : %.cpp

-	$(CC) -S $(ALL_CPPFLAGS) $< -o $@

-

-

-# Assemble: create object files from assembler source files.

-$(OBJDIR)/%.o : %.S

-	@echo

-	@echo $(MSG_ASSEMBLING) $<

-	$(CC) -c $(ALL_ASFLAGS) $< -o $@

-

-

-# Create preprocessed source for use in sending a bug report.

-%.i : %.c

-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@

-

-

-# Target: clean project.

-clean: begin clean_list end

-

-clean_list :

-	@echo

-	@echo $(MSG_CLEANING)

-	$(REMOVE) $(TARGET).hex

-	$(REMOVE) $(TARGET).bin

-	$(REMOVE) $(TARGET).eep

-	$(REMOVE) $(TARGET).cof

-	$(REMOVE) $(TARGET).elf

-	$(REMOVE) $(TARGET).map

-	$(REMOVE) $(TARGET).sym

-	$(REMOVE) $(TARGET).lss

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)

-	$(REMOVE) $(SRC:.c=.s)

-	$(REMOVE) $(SRC:.c=.d)

-	$(REMOVE) $(SRC:.c=.i)

-	$(REMOVEDIR) .dep

-

-

-# Create object files directory

-$(shell mkdir $(OBJDIR) 2>/dev/null)

-

-

-# Include the dependency files.

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

-

-

-# Listing of phony targets.

-.PHONY : all begin finish end sizebefore sizeafter gccversion \

-build elf hex bin eep lss sym coff extcoff \

-clean clean_list program debug gdb-config

-

diff --git a/testhal/AVR/PWM/chconf.h b/testhal/AVR/PWM/chconf.h
deleted file mode 100644
index f95f65faa..000000000
--- a/testhal/AVR/PWM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    AVR/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    250

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_MEMCORE_SIZE                 128

-#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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  FALSE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

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

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @note    It is invoked from within @p chThdInit() and implicitily from all

- *          the threads creation APIs.

- */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/PWM/halconf.h b/testhal/AVR/PWM/halconf.h
deleted file mode 100644
index 3d2b067d4..000000000
--- a/testhal/AVR/PWM/halconf.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the DAC subsystem.

- */

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

-#define HAL_USE_DAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Block size for MMC transfers.

- */

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

-#define MMC_SECTOR_SIZE             512

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/**

- * @brief   Number of positive insertion queries before generating the

- *          insertion event.

- */

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

-#define MMC_POLLING_INTERVAL        10

-#endif

-

-/**

- * @brief   Interval, in milliseconds, between insertion queries.

- */

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

-#define MMC_POLLING_DELAY           10

-#endif

-

-/**

- * @brief   Uses the SPI polled API for small data transfers.

- * @details Polled transfers usually improve performance because it

- *          saves two context switches and interrupt servicing. Note

- *          that this option has no effect on large transfers which

- *          are always performed using DMAs/IRQs.

- */

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

-#define MMC_USE_SPI_POLLING         TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intevals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/PWM/main.c b/testhal/AVR/PWM/main.c
deleted file mode 100644
index a37d59989..000000000
--- a/testhal/AVR/PWM/main.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-int main(void) {

-

-  halInit();

-  chSysInit();

-

-  static PWMConfig pwm1cfg = {

-    1023,   /* Not real clock */

-    1023,   /* Maximum PWM count */

-    NULL,

-    {

-      {PWM_OUTPUT_ACTIVE_HIGH, NULL},

-      {PWM_OUTPUT_ACTIVE_HIGH, NULL},

-      {PWM_OUTPUT_ACTIVE_HIGH, NULL},

-    },

-  };

-

-  /* PB5-7 are timer 1 pwm channel outputs */

-  palSetPadMode(IOPORT2, 7, PAL_MODE_OUTPUT_PUSHPULL);

-  palSetPadMode(IOPORT2, 6, PAL_MODE_OUTPUT_PUSHPULL);

-  palSetPadMode(IOPORT2, 5, PAL_MODE_OUTPUT_PUSHPULL);

-

-  pwmStart(&PWMD1, &pwm1cfg);

-

-  /* channel 0 with 50% duty cycle, 1 with 25% and 2 with 75% */

-  pwmEnableChannel(&PWMD1, 0, 511);

-  pwmEnableChannel(&PWMD1, 1, 255);

-  pwmEnableChannel(&PWMD1, 2, 767);

-

-  while (1) {

-    chThdSleepMilliseconds(500);

-  }

-}

diff --git a/testhal/AVR/PWM/mcuconf.h b/testhal/AVR/PWM/mcuconf.h
deleted file mode 100644
index 08691fd56..000000000
--- a/testhal/AVR/PWM/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * AVR drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-/*

- * PWM driver system settings.

- */

-#define AVR_PWM_USE_TIM1                TRUE

-#define AVR_PWM_USE_TIM2                TRUE

diff --git a/testhal/AVR/PWM/readme.txt b/testhal/AVR/PWM/readme.txt
deleted file mode 100644
index c34cb4e8d..000000000
--- a/testhal/AVR/PWM/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT port for Atmel AVR ATmega1280.                                **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Arduino Mega board.

-

-** The Demo **

-

-This demo creates three PWM channels on pins PB5, PB6 and PB7. Each channel uses

-a different duty cycle with PB7 having a duty cycle of 50%, PB6 a duty cycle of

-25% and PB5 a duty cycle of 75%. Since the LED is connected to PB7 on the Arduino

-Mega, it can be seen flashing in high speed.

-

-** Build Procedure **

-

-The demo was built using the GCC AVR toolchain. It should build with WinAVR too!

-

-** Notes **

-

-This demo runs natively so the Arduino bootloader must be removed and the FUSEs

-reprogrammed. The values used for fuses are LFUSE=0xe7 and HFUSE=0x99.

diff --git a/testhal/AVR/SPI/Makefile b/testhal/AVR/SPI/Makefile
deleted file mode 100644
index 2e7a1d9c0..000000000
--- a/testhal/AVR/SPI/Makefile
+++ /dev/null
@@ -1,630 +0,0 @@
-# Hey Emacs, this is a -*- makefile -*-

-#----------------------------------------------------------------------------

-# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.

-#

-# Released to the Public Domain

-#

-# Additional material for this makefile was written by:

-# Peter Fleury

-# Tim Henigan

-# Colin O'Flynn

-# Reiner Patommel

-# Markus Pfaff

-# Sander Pool

-# Frederik Rouleau

-# Carlos Lamas

-#

-#----------------------------------------------------------------------------

-# On command line:

-#

-# make all = Make software.

-#

-# make clean = Clean out built project files.

-#

-# make coff = Convert ELF to AVR COFF.

-#

-# make extcoff = Convert ELF to AVR Extended COFF.

-#

-# make program = Download the hex file to the device, using avrdude.

-#                Please customize the avrdude settings below first!

-#

-# make debug = Start either simulavr or avarice as specified for debugging,

-#              with avr-gdb or avr-insight as the front end for debugging.

-#

-# make filename.s = Just compile filename.c into the assembler code only.

-#

-# make filename.i = Create a preprocessed source file for use in submitting

-#                   bug reports to the GCC project.

-#

-# To rebuild project do "make clean" then "make all".

-#----------------------------------------------------------------------------

-

-

-# MCU name

-MCU = atmega328p

-

-

-# Processor frequency.

-F_CPU = 16000000

-

-

-# Output format. (can be srec, ihex, binary)

-FORMAT = ihex

-

-

-# Target file name (without extension).

-TARGET = ch

-

-

-# Object files directory

-#     To put object files in current directory, use a dot (.), do NOT make

-#     this an empty or blank macro!

-OBJDIR = .

-

-

-# Imported source files

-CHIBIOS = ../../..

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

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

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

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

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

-

-# List C source files here. (C dependencies are automatically generated.)

-SRC = $(PORTSRC) \

-      $(KERNSRC) \

-      $(TESTSRC) \

-      $(HALSRC) \

-      $(PLATFORMSRC) \

-      $(BOARDSRC) \

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

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

-      main.c

-

-

-# List C++ source files here. (C dependencies are automatically generated.)

-CPPSRC =

-

-

-# List Assembler source files here.

-#     Make them always end in a capital .S.  Files ending in a lowercase .s

-#     will not be considered source files but generated files (assembler

-#     output from the compiler), and will be deleted upon "make clean"!

-#     Even though the DOS/Win* filesystem matches both .s and .S the same,

-#     it will preserve the spelling of the filenames, and gcc itself does

-#     care about how the name is spelled on its command-line.

-ASRC =

-

-

-# Optimization level, can be [0, 1, 2, 3, s].

-#     0 = turn off optimization. s = optimize for size.

-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = 2

-

-

-# Debugging format.

-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.

-#     AVR Studio 4.10 requires dwarf-2.

-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.

-DEBUG = dwarf-2

-

-

-# List any extra directories to look for include files here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

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

-               $(CHIBIOS)/os/various

-

-

-# Compiler flag to set the C Standard level.

-#     c89   = "ANSI" C

-#     gnu89 = c89 plus GCC extensions

-#     c99   = ISO C99 standard (not yet fully implemented)

-#     gnu99 = c99 plus GCC extensions

-CSTANDARD = -std=gnu99

-

-

-# Place -D or -U options here for C sources

-CDEFS = -DF_CPU=$(F_CPU)UL

-

-

-# Place -D or -U options here for ASM sources

-ADEFS = -DF_CPU=$(F_CPU)

-

-

-# Place -D or -U options here for C++ sources

-CPPDEFS = -DF_CPU=$(F_CPU)UL

-#CPPDEFS += -D__STDC_LIMIT_MACROS

-#CPPDEFS += -D__STDC_CONSTANT_MACROS

-

-

-

-#---------------- Compiler Options C ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CFLAGS = -g$(DEBUG)

-CFLAGS += $(CDEFS)

-CFLAGS += -O$(OPT)

-CFLAGS += -funsigned-char

-CFLAGS += -funsigned-bitfields

-CFLAGS += -fpack-struct

-CFLAGS += -fshort-enums

-#CFLAGS += -fno-strict-aliasing

-CFLAGS += -Wall

-CFLAGS += -Wstrict-prototypes

-#CFLAGS += -mshort-calls

-#CFLAGS += -fno-unit-at-a-time

-#CFLAGS += -Wundef

-#CFLAGS += -Wunreachable-code

-#CFLAGS += -Wsign-compare

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-CFLAGS += $(CSTANDARD)

-

-

-#---------------- Compiler Options C++ ----------------

-#  -g*:          generate debugging information

-#  -O*:          optimization level

-#  -f...:        tuning, see GCC manual and avr-libc documentation

-#  -Wall...:     warning level

-#  -Wa,...:      tell GCC to pass this to the assembler.

-#    -adhlns...: create assembler listing

-CPPFLAGS = -g$(DEBUG)

-CPPFLAGS += $(CPPDEFS)

-CPPFLAGS += -O$(OPT)

-CPPFLAGS += -funsigned-char

-CPPFLAGS += -funsigned-bitfields

-CPPFLAGS += -fpack-struct

-CPPFLAGS += -fshort-enums

-CPPFLAGS += -fno-exceptions

-CPPFLAGS += -Wall

-CFLAGS += -Wundef

-#CPPFLAGS += -mshort-calls

-#CPPFLAGS += -fno-unit-at-a-time

-#CPPFLAGS += -Wstrict-prototypes

-#CPPFLAGS += -Wunreachable-code

-#CPPFLAGS += -Wsign-compare

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

-CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

-#CPPFLAGS += $(CSTANDARD)

-

-

-#---------------- Assembler Options ----------------

-#  -Wa,...:   tell GCC to pass this to the assembler.

-#  -adhlns:   create listing

-#  -gstabs:   have the assembler create line number information; note that

-#             for use in COFF files, additional information about filenames

-#             and function names needs to be present in the assembler source

-#             files -- see avr-libc docs [FIXME: not yet described there]

-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex

-#       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

-

-

-#---------------- Library Options ----------------

-# Minimalistic printf version

-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min

-

-# Floating point printf version (requires MATH_LIB = -lm below)

-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt

-

-# If this is left blank, then it will use the Standard printf version.

-PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_MIN)

-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)

-

-

-# Minimalistic scanf version

-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min

-

-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)

-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt

-

-# If this is left blank, then it will use the Standard scanf version.

-SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_MIN)

-#SCANF_LIB = $(SCANF_LIB_FLOAT)

-

-

-MATH_LIB = -lm

-

-

-# List any extra directories to look for libraries here.

-#     Each directory must be seperated by a space.

-#     Use forward slashes for directory separators.

-#     For a directory that has spaces, enclose it in quotes.

-EXTRALIBDIRS =

-

-

-

-#---------------- External Memory Options ----------------

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# used for variables (.data/.bss) and heap (malloc()).

-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff

-

-# 64 KB of external RAM, starting after internal RAM (ATmega128!),

-# only used for heap (malloc()).

-#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff

-

-EXTMEMOPTS =

-

-

-

-#---------------- Linker Options ----------------

-#  -Wl,...:     tell GCC to pass this to linker.

-#    -Map:      create map file

-#    --cref:    add cross reference to  map file

-LDFLAGS = -Wl,-Map=$(TARGET).map,--cref

-LDFLAGS += $(EXTMEMOPTS)

-LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))

-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)

-#LDFLAGS += -T linker_script.x

-

-

-

-#---------------- Programming Options (avrdude) ----------------

-

-# Programming hardware: alf avr910 avrisp bascom bsd

-# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500

-#

-# Type: avrdude -c ?

-# to get a full listing.

-#

-AVRDUDE_PROGRAMMER = arduino

-

-# com1 = serial port. Use lpt1 to connect to parallel port.

-AVRDUDE_PORT = /dev/ttyUSB0    # programmer connected to serial device

-#AVRDUDE_PORT = /dev/ttyACM0    # programmer connected to serial device

-

-AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex

-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep

-

-

-# Uncomment the following if you want avrdude's erase cycle counter.

-# Note that this counter needs to be initialized first using -Yn,

-# see avrdude manual.

-#AVRDUDE_ERASE_COUNTER = -y

-

-# Uncomment the following if you do /not/ wish a verification to be

-# performed after programming the device.

-#AVRDUDE_NO_VERIFY = -V

-

-# Increase verbosity level.  Please use this when submitting bug

-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>

-# to submit bug reports.

-#AVRDUDE_VERBOSE = -v -v

-

-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)

-AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)

-AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)

-AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)

-AVRDUDE_FLAGS += -b 57600

-

-

-#---------------- Debugging Options ----------------

-

-# For simulavr only - target MCU frequency.

-DEBUG_MFREQ = $(F_CPU)

-

-# Set the DEBUG_UI to either gdb or insight.

-# DEBUG_UI = gdb

-DEBUG_UI = insight

-

-# Set the debugging back-end to either avarice, simulavr.

-DEBUG_BACKEND = avarice

-#DEBUG_BACKEND = simulavr

-

-# GDB Init Filename.

-GDBINIT_FILE = __avr_gdbinit

-

-# When using avarice settings for the JTAG

-JTAG_DEV = /dev/com1

-

-# Debugging port used to communicate between GDB / avarice / simulavr.

-DEBUG_PORT = 4242

-

-# Debugging host used to communicate between GDB / avarice / simulavr, normally

-#     just set to localhost unless doing some sort of crazy debugging when

-#     avarice is running on a different computer.

-DEBUG_HOST = localhost

-

-

-

-#============================================================================

-

-

-# Define programs and commands.

-SHELL = sh

-CC = avr-gcc

-OBJCOPY = avr-objcopy

-OBJDUMP = avr-objdump

-SIZE = avr-size

-AR = avr-ar rcs

-NM = avr-nm

-AVRDUDE = avrdude

-REMOVE = rm -f

-REMOVEDIR = rm -rf

-COPY = cp

-WINSHELL = cmd

-

-

-# Define Messages

-# English

-MSG_ERRORS_NONE = Errors: none

-MSG_BEGIN = -------- begin --------

-MSG_END = --------  end  --------

-MSG_SIZE_BEFORE = Size before:

-MSG_SIZE_AFTER = Size after:

-MSG_COFF = Converting to AVR COFF:

-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:

-MSG_FLASH = Creating load file for Flash:

-MSG_EEPROM = Creating load file for EEPROM:

-MSG_EXTENDED_LISTING = Creating Extended Listing:

-MSG_SYMBOL_TABLE = Creating Symbol Table:

-MSG_LINKING = Linking:

-MSG_COMPILING = Compiling C:

-MSG_COMPILING_CPP = Compiling C++:

-MSG_ASSEMBLING = Assembling:

-MSG_CLEANING = Cleaning project:

-MSG_CREATING_LIBRARY = Creating library:

-

-

-

-

-# Define all object files.

-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)

-

-# Define all listing files.

-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)

-

-

-# Compiler flags to generate dependency files.

-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d

-

-

-# Combine all necessary flags and optional flags.

-# Add target processor to flags.

-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)

-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)

-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)

-

-

-

-

-

-# Default target.

-all: begin gccversion sizebefore build sizeafter end

-

-# Change the build target to build a HEX file or a library.

-build: elf hex bin eep lss sym

-#build: lib

-

-

-elf: $(TARGET).elf

-hex: $(TARGET).hex

-bin: $(TARGET).bin

-eep: $(TARGET).eep

-lss: $(TARGET).lss

-sym: $(TARGET).sym

-LIBNAME=lib$(TARGET).a

-lib: $(LIBNAME)

-

-

-

-# Eye candy.

-# AVR Studio 3.x does not check make's exit code but relies on

-# the following magic strings to be generated by the compile job.

-begin:

-	@echo

-	@echo $(MSG_BEGIN)

-

-end:

-	@echo $(MSG_END)

-	@echo

-

-

-# Display size of file.

-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex

-ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf

-

-sizebefore:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-sizeafter:

-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

-	2>/dev/null; echo; fi

-

-

-

-# Display compiler version information.

-gccversion :

-	@$(CC) --version

-

-

-

-# Program the device.

-program: $(TARGET).hex $(TARGET).eep

-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

-

-

-# Generate avr-gdb config/init file which does the following:

-#     define the reset signal, load the target file, connect to target, and set

-#     a breakpoint at main().

-gdb-config:

-	@$(REMOVE) $(GDBINIT_FILE)

-	@echo define reset >> $(GDBINIT_FILE)

-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)

-	@echo end >> $(GDBINIT_FILE)

-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)

-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)

-ifeq ($(DEBUG_BACKEND),simulavr)

-	@echo load  >> $(GDBINIT_FILE)

-endif

-	@echo break main >> $(GDBINIT_FILE)

-

-debug: gdb-config $(TARGET).elf

-ifeq ($(DEBUG_BACKEND), avarice)

-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.

-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \

-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)

-	@$(WINSHELL) /c pause

-

-else

-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \

-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)

-endif

-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)

-

-

-

-

-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.

-COFFCONVERT = $(OBJCOPY) --debugging

-COFFCONVERT += --change-section-address .data-0x800000

-COFFCONVERT += --change-section-address .bss-0x800000

-COFFCONVERT += --change-section-address .noinit-0x800000

-COFFCONVERT += --change-section-address .eeprom-0x810000

-

-

-

-coff: $(TARGET).elf

-	@echo

-	@echo $(MSG_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof

-

-

-extcoff: $(TARGET).elf

-	@echo

-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof

-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof

-

-

-

-# Create final output files (.hex, .eep) from ELF output file.

-%.hex: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@

-

-%.bin: %.elf

-	@echo

-	@echo $(MSG_FLASH) $@

-	$(OBJCOPY) -O binary -R .eeprom $< $@

-

-%.eep: %.elf

-	@echo

-	@echo $(MSG_EEPROM) $@

-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \

-	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0

-

-# Create extended listing file from ELF output file.

-%.lss: %.elf

-	@echo

-	@echo $(MSG_EXTENDED_LISTING) $@

-	$(OBJDUMP) -h -S $< > $@

-

-# Create a symbol table from ELF output file.

-%.sym: %.elf

-	@echo

-	@echo $(MSG_SYMBOL_TABLE) $@

-	$(NM) -n $< > $@

-

-

-

-# Create library from object files.

-.SECONDARY : $(TARGET).a

-.PRECIOUS : $(OBJ)

-%.a: $(OBJ)

-	@echo

-	@echo $(MSG_CREATING_LIBRARY) $@

-	$(AR) $@ $(OBJ)

-

-

-# Link: create ELF output file from object files.

-.SECONDARY : $(TARGET).elf

-.PRECIOUS : $(OBJ)

-%.elf: $(OBJ)

-	@echo

-	@echo $(MSG_LINKING) $@

-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)

-

-

-# Compile: create object files from C source files.

-$(OBJDIR)/%.o : %.c

-	@echo

-	@echo $(MSG_COMPILING) $<

-	$(CC) -c $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create object files from C++ source files.

-$(OBJDIR)/%.o : %.cpp

-	@echo

-	@echo $(MSG_COMPILING_CPP) $<

-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C source files.

-%.s : %.c

-	$(CC) -S $(ALL_CFLAGS) $< -o $@

-

-

-# Compile: create assembler files from C++ source files.

-%.s : %.cpp

-	$(CC) -S $(ALL_CPPFLAGS) $< -o $@

-

-

-# Assemble: create object files from assembler source files.

-$(OBJDIR)/%.o : %.S

-	@echo

-	@echo $(MSG_ASSEMBLING) $<

-	$(CC) -c $(ALL_ASFLAGS) $< -o $@

-

-

-# Create preprocessed source for use in sending a bug report.

-%.i : %.c

-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@

-

-

-# Target: clean project.

-clean: begin clean_list end

-

-clean_list :

-	@echo

-	@echo $(MSG_CLEANING)

-	$(REMOVE) $(TARGET).hex

-	$(REMOVE) $(TARGET).bin

-	$(REMOVE) $(TARGET).eep

-	$(REMOVE) $(TARGET).cof

-	$(REMOVE) $(TARGET).elf

-	$(REMOVE) $(TARGET).map

-	$(REMOVE) $(TARGET).sym

-	$(REMOVE) $(TARGET).lss

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)

-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)

-	$(REMOVE) $(SRC:.c=.s)

-	$(REMOVE) $(SRC:.c=.d)

-	$(REMOVE) $(SRC:.c=.i)

-	$(REMOVEDIR) .dep

-

-

-# Create object files directory

-$(shell mkdir $(OBJDIR) 2>/dev/null)

-

-

-# Include the dependency files.

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

-

-

-# Listing of phony targets.

-.PHONY : all begin finish end sizebefore sizeafter gccversion \

-build elf hex bin eep lss sym coff extcoff \

-clean clean_list program debug gdb-config

-

diff --git a/testhal/AVR/SPI/chconf.h b/testhal/AVR/SPI/chconf.h
deleted file mode 100644
index bf98adae4..000000000
--- a/testhal/AVR/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1250

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_MEMCORE_SIZE                 128

-#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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  FALSE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

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

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @note    It is invoked from within @p chThdInit() and implicitily from all

- *          the threads creation APIs.

- */

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

-#define THREAD_EXT_INIT_HOOK(tp) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/SPI/halconf.h b/testhal/AVR/SPI/halconf.h
deleted file mode 100644
index c1dd89a9d..000000000
--- a/testhal/AVR/SPI/halconf.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Block size for MMC transfers.

- */

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

-#define MMC_SECTOR_SIZE             512

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/**

- * @brief   Number of positive insertion queries before generating the

- *          insertion event.

- */

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

-#define MMC_POLLING_INTERVAL        10

-#endif

-

-/**

- * @brief   Interval, in milliseconds, between insertion queries.

- */

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

-#define MMC_POLLING_DELAY           10

-#endif

-

-/**

- * @brief   Uses the SPI polled API for small data transfers.

- * @details Polled transfers usually improve performance because it

- *          saves two context switches and interrupt servicing. Note

- *          that this option has no effect on large transfers which

- *          are always performed using DMAs/IRQs.

- */

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

-#define MMC_USE_SPI_POLLING         TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intevals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      57600

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         32

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/AVR/SPI/main.c b/testhal/AVR/SPI/main.c
deleted file mode 100644
index 1ccd4485f..000000000
--- a/testhal/AVR/SPI/main.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include <util/delay.h>

-#include "chprintf.h"

-

-// #define SPI_ROLE SPI_ROLE_SLAVE

-#define SPI_ROLE SPI_ROLE_MASTER

-#if (SPI_ROLE == SPI_ROLE_MASTER)

-	#define ROLE "Master"

-    char msg[] = "Message from master\r\n";

-#else

-	#define ROLE "Slave"

-    char msg[] = "Message from slave \r\n";

-#endif

-

-void spicallback(SPIDriver *spip){

-  chSequentialStreamPut(&SD1, '.');

-  spip->txbuf = 0; // terminating null

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-/*

- * SPI interface configuration

- */

-  static SPIConfig spicfg = {

-    SPI_ROLE,

-    IOPORT2,

-    SPI1_SS,

-    SPI_MODE_0,

-    SPI_MSB_FIRST,

-    SPI_SCK_FOSC_128,

-    spicallback

-  };

- 

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-

-  halInit();

-  chSysInit();

-

-  spiStart(&SPID1, &spicfg);

-  sdStart(&SD1, NULL);

-

-  chprintf((BaseSequentialStream *) &SD1, "Start %s\r\n", ROLE);

-

-  while(1) {

-    char buf[24];

-

-#if (SPI_ROLE == SPI_ROLE_MASTER)

-    spiSelect(&SPID1);

-    spiExchange(&SPID1, sizeof(msg), msg, buf);

-    spiUnselect(&SPID1);

-

-    chprintf((BaseSequentialStream *) &SD1,"%s: %s\r\n", ROLE, buf);      

-    chThdSleepMilliseconds(500);

-#else

-    spiExchange(&SPID1, sizeof(msg), msg, buf);

-    chprintf((BaseSequentialStream *) &SD1,"%s: %s\r\n", ROLE, buf);

-#endif

-

-  }

-}

diff --git a/testhal/AVR/SPI/master.c b/testhal/AVR/SPI/master.c
deleted file mode 100644
index 4059b6a3b..000000000
--- a/testhal/AVR/SPI/master.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/>.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include <util/delay.h>

-#include "chprintf.h"

-

-// #define SPI_ROLE SPI_ROLE_SLAVE

-#define SPI_ROLE SPI_ROLE_MASTER

-#if (SPI_ROLE == SPI_ROLE_MASTER)

-	#define ROLE "Master"

-    char msg[] = "Message from master\r\n";

-#else

-	#define ROLE "Slave"

-    char msg[] = "Message from slave\r\n";

-#endif

-

-void spicallback(SPIDriver *spip){

-  chSequentialStreamPut(&SD1, '.');

-  spip->txbuf = 0; // terminating null

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-/*

- * SPI interface configuration

- */

-  static SPIConfig spicfg = {

-    SPI_ROLE,

-    IOPORT2,

-    SPI1_SS,

-    SPI_MODE_0,

-    SPI_MSB_FIRST,

-    SPI_SCK_FOSC_128,

-    spicallback

-  };

- 

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-

-  halInit();

-  chSysInit();

-

-  spiStart(&SPID1, &spicfg);

-  sdStart(&SD1, NULL);

-

-  chprintf((BaseSequentialStream *) &SD1, "Start %s\r\n", role);

-

-  while(1) {

-    char buf[24];

-

-    spiSelect(&SPID1);

-    spiExchange(&SPID1, sizeof(msg), msg, buf);

-    spiUnselect(&SPID1);

-

-    chprintf((BaseSequentialStream *) &SD1,"%s: %s\r\n", role, buf);

-      

-    chThdSleepMilliseconds(500);

-  }

-}

diff --git a/testhal/AVR/SPI/mcuconf.h b/testhal/AVR/SPI/mcuconf.h
deleted file mode 100644
index 6bf30f02b..000000000
--- a/testhal/AVR/SPI/mcuconf.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * AVR drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-/*

- * ADC driver system settings.

- */

-

-#define AVR_ADC_USE_ADC1              TRUE

-

-/*

- * CAN driver system settings.

- */

-

-/*

- * MAC driver system settings.

- */

-

-/*

- * PWM driver system settings.

- */

-

-#define AVR_PWM_USE_TIM1          FALSE

-#define AVR_PWM_USE_TIM2          FALSE

-

-/*

- * Serial driver system settings.

- */

-

-#define AVR_SERIAL_USE_USART0    TRUE

-#define AVR_SERIAL_USE_USART1    FALSE

-

-/*

- * SPI driver system settings.

- */

-

-#define AVR_SPI_USE_SPI1        TRUE

-#define AVR_SPI_USE_16BIT_POLLED_EXCHANGE FALSE

diff --git a/testhal/AVR/SPI/readme.txt b/testhal/AVR/SPI/readme.txt
deleted file mode 100644
index 399cc230a..000000000
--- a/testhal/AVR/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT port for Atmel AVR ATmega1280.                                **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Arduino board.

-

-** The Demo **

-

-Connect the SPI interfaces of two Arduino boards. Configure one as master, the other

-as slave using the #define statement in main.c. 

-

-Once the master starts running, the two boards will exchange messages using SPI 

-and output the messages over the USB serial port.

- 

-** Build Procedure **

-

-The demo was built using the GCC AVR toolchain. It should build with WinAVR too!

-

-** Notes **

-

-This demo can be programmed onto the Arduino while leaving the Arduino bootloader

-in place. This means that the programming can be done through the USB connector

-as well.

diff --git a/testhal/AVR/SPI/slave.c b/testhal/AVR/SPI/slave.c
deleted file mode 100644
index eb05f5180..000000000
--- a/testhal/AVR/SPI/slave.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/>.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include <util/delay.h>

-#include "chprintf.h"

-

-#define SPI_ROLE SPI_ROLE_SLAVE

-// #define SPI_ROLE SPI_ROLE_MASTER

-#if (SPI_ROLE == SPI_ROLE_MASTER)

-	#define ROLE "Master"

-    char msg[] = "Message from master\r\n";

-#else

-	#define ROLE "Slave"

-    char msg[] = "Message from slave\r\n";

-#endif

-

-void spicallback(SPIDriver *spip){

-  chSequentialStreamPut(&SD1, '.');

-  spip->txbuf = 0; // terminating null

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-/*

- * SPI interface configuration

- */

-  static SPIConfig spicfg = {

-    SPI_ROLE,

-    IOPORT2,

-    SPI1_SS,

-    SPI_MODE_0,

-    SPI_MSB_FIRST,

-    SPI_SCK_FOSC_128,

-    spicallback

-  };

- 

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-

-  halInit();

-  chSysInit();

-

-  spiStart(&SPID1, &spicfg);

-  sdStart(&SD1, NULL);

-

-  chprintf((BaseSequentialStream *) &SD1, "Start %s\r\n", role);

-

-  while(1) {

-    char buf[24];

-

-    spiExchange(&SPID1, sizeof(msg), msg, buf);

-    chprintf((BaseSequentialStream *) &SD1,"%s: %s\r\n", role, buf);

-

-  }

-}

diff --git a/testhal/LPC11xx/EXT/Makefile b/testhal/LPC11xx/EXT/Makefile
deleted file mode 100644
index 2ad18e131..000000000
--- a/testhal/LPC11xx/EXT/Makefile
+++ /dev/null
@@ -1,194 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

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

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

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

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

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

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC11C24.ld

-

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

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       main.c

-

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

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

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

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

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1114 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

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

diff --git a/testhal/LPC11xx/EXT/chconf.h b/testhal/LPC11xx/EXT/chconf.h
deleted file mode 100644
index fe07600ff..000000000
--- a/testhal/LPC11xx/EXT/chconf.h
+++ /dev/null
@@ -1,533 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/EXT/halconf.h b/testhal/LPC11xx/EXT/halconf.h
deleted file mode 100644
index 06b4df2cc..000000000
--- a/testhal/LPC11xx/EXT/halconf.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 TRUE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/EXT/main.c b/testhal/LPC11xx/EXT/main.c
deleted file mode 100644
index bb2ef5aa6..000000000
--- a/testhal/LPC11xx/EXT/main.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    EXT haltest - Copyright (C) 2013 Marcin Jokel

-                - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void ledoff(void *arg) {

-

-  (void)arg;

-  palClearPad(GPIO0, GPIO0_LED);

-}

-

-/* Triggered when the button is pressed or released. The LED is set to ON.*/

-static void ext_cb0(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

-

-  (void)extp;

-  (void)channel;

-

-  palSetPad(GPIO0, GPIO0_LED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

-

-  /* LED set to OFF after 200mS.*/

-  chVTSetI(&vt4, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

-}

-

-static const EXTConfig extcfg = {

-  {

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_BOTH_EDGES | EXT_CH_MODE_AUTOSTART, ext_cb0},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL}

-  }

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the EXT driver 0.

-   */

-  extStart(&EXTD0, &extcfg);

-

-  /*

-   * Normal main() thread activity, in this demo it enables and disables the

-   * button EXT channel using 5 seconds intervals.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-    extChannelDisable(&EXTD0, GPIO0_SW_ISP);

-    chThdSleepMilliseconds(5000);

-    extChannelEnable(&EXTD0, GPIO0_SW_ISP);

-  }

-}

diff --git a/testhal/LPC11xx/EXT/mcuconf.h b/testhal/LPC11xx/EXT/mcuconf.h
deleted file mode 100644
index b5493dbb7..000000000
--- a/testhal/LPC11xx/EXT/mcuconf.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1114 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC11xx_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC11xx_SYSPLL_MUL                  4

-#define LPC11xx_SYSPLL_DIV                  4

-#define LPC11xx_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC11xx_SYSABHCLK_DIV               1

-

-/*

- * GPT driver system settings.

- */

-#define LPC11xx_GPT_USE_CT16B0              FALSE

-#define LPC11xx_GPT_USE_CT16B1              FALSE

-#define LPC11xx_GPT_USE_CT32B0              FALSE

-#define LPC11xx_GPT_USE_CT32B1              FALSE

-#define LPC11xx_GPT_CT16B0_IRQ_PRIORITY     1

-#define LPC11xx_GPT_CT16B1_IRQ_PRIORITY     3

-#define LPC11xx_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC11xx_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC11xx_SERIAL_USE_UART0            TRUE

-#define LPC11xx_SERIAL_FIFO_PRELOAD         16

-#define LPC11xx_SERIAL_UART0CLKDIV          1

-#define LPC11xx_SERIAL_UART0_IRQ_PRIORITY   3

-

-/*

- * SPI driver system settings.

- */

-#define LPC11xx_SPI_USE_SSP0                TRUE

-#define LPC11xx_SPI_USE_SSP1                FALSE

-#define LPC11xx_SPI_SSP0CLKDIV              1

-#define LPC11xx_SPI_SSP1CLKDIV              1

-#define LPC11xx_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP1_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-#define LPC11xx_SPI_SCK0_SELECTOR           SCK0_IS_PIO2_11

-

-/*

- * EXT driver system settings.

- */

-#define LPC11xx_EXT_USE_EXT0                TRUE

-#define LPC11xx_EXT_USE_EXT1                FALSE

-#define LPC11xx_EXT_USE_EXT2                FALSE

-#define LPC11xx_EXT_USE_EXT3                FALSE

-#define LPC11xx_EXT_EXTI0_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI1_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI2_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI3_IRQ_PRIORITY      3

-

-/*

- * I2C driver system settings.

- */

-#define LPC11xx_I2C_IRQ_PRIORITY            3

-

-/*

- * PWM driver system settings.

- */

-#define LPC11xx_PWM_USE_CT16B0              FALSE

-#define LPC11xx_PWM_USE_CT16B1              TRUE

-#define LPC11xx_PWM_USE_CT32B0              FALSE

-#define LPC11xx_PWM_USE_CT32B1              FALSE

-#define LPC11xx_PWM_USE_CT16B0_CH0          FALSE

-#define LPC11xx_PWM_USE_CT16B0_CH1          FALSE

-#define LPC11xx_PWM_USE_CT16B1_CH0          TRUE

-#define LPC11xx_PWM_USE_CT16B1_CH1          TRUE

-#define LPC11xx_PWM_USE_CT32B0_CH0          FALSE

-#define LPC11xx_PWM_USE_CT32B0_CH1          FALSE

-#define LPC11xx_PWM_USE_CT32B1_CH0          FALSE

-#define LPC11xx_PWM_USE_CT32B1_CH1          FALSE

-#define LPC11xx_PWM_CT16B0_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT16B1_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT32B0_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT32B1_IRQ_PRIORITY     3

diff --git a/testhal/LPC11xx/IRQ_STORM/Makefile b/testhal/LPC11xx/IRQ_STORM/Makefile
deleted file mode 100644
index 2dd75ef71..000000000
--- a/testhal/LPC11xx/IRQ_STORM/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

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

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

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

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

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

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1114.ld

-

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

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

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

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

-       main.c

-

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

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

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

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

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1114 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

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

diff --git a/testhal/LPC11xx/IRQ_STORM/chconf.h b/testhal/LPC11xx/IRQ_STORM/chconf.h
deleted file mode 100644
index f943ea80c..000000000
--- a/testhal/LPC11xx/IRQ_STORM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

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

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

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

- */

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

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Debug options

- * @{

- */

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

-

-/**

- * @brief   Debug option, system state check.

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

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

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

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

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

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

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

-#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

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

- */

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

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

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

-/**

- * @name Kernel hooks

- * @{

- */

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

-

-/**

- * @brief   Threads descriptor structure extension.

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

- */

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

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

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

- */

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

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

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

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

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

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/IRQ_STORM/halconf.h b/testhal/LPC11xx/IRQ_STORM/halconf.h
deleted file mode 100644
index d91a792b4..000000000
--- a/testhal/LPC11xx/IRQ_STORM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

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

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

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

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

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

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

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

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

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

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

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

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

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

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

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

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

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

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

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

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

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

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

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

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

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

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

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

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

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

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

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

-#define HAL_USE_USB                 FALSE

-#endif

-

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

-/* ADC driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* CAN driver related settings.                                              */

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

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

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

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

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

-/* I2C driver related settings.                                              */

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

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

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

-/* MAC driver related settings.                                              */

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

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

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

-#define MAC_USE_EVENTS              TRUE

-#endif

-

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

-/* MMC_SPI driver related settings.                                          */

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

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

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

-#define MMC_NICE_WAITING            TRUE

-#endif

-

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

-/* SDC driver related settings.                                              */

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

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

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

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

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

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

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

-#define SDC_NICE_WAITING            TRUE

-#endif

-

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

-/* SERIAL driver related settings.                                           */

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

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

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

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

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

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

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

-/* SPI driver related settings.                                              */

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

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

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

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/IRQ_STORM/main.c b/testhal/LPC11xx/IRQ_STORM/main.c
deleted file mode 100644
index 9930abfb1..000000000
--- a/testhal/LPC11xx/IRQ_STORM/main.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

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

-/* Configurable settings.                                                    */

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

-

-#ifndef RANDOMIZE

-#define RANDOMIZE       FALSE

-#endif

-

-#ifndef ITERATIONS

-#define ITERATIONS      100

-#endif

-

-#ifndef NUM_THREADS

-#define NUM_THREADS     4

-#endif

-

-#ifndef MAILBOX_SIZE

-#define MAILBOX_SIZE    4

-#endif

-

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

-/* Test related code.                                                        */

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

-

-#define MSG_SEND_LEFT   0

-#define MSG_SEND_RIGHT  1

-

-static bool_t saturated;

-

-/*

- * Mailboxes and buffers.

- */

-static Mailbox mb[NUM_THREADS];

-static msg_t b[NUM_THREADS][MAILBOX_SIZE];

-

-/*

- * Test worker threads.

- */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

-static msg_t WorkerThread(void *arg) {

-  static volatile unsigned x = 0;

-  static unsigned cnt = 0;

-  unsigned me = (unsigned)arg;

-  unsigned target;

-  unsigned r;

-  msg_t msg;

-

-  chRegSetThreadName("worker");

-

-  /* Work loop.*/

-  while (TRUE) {

-    /* Waiting for a message.*/

-   chMBFetch(&mb[me], &msg, TIME_INFINITE);

-

-#if RANDOMIZE

-   /* Pseudo-random delay.*/

-   {

-     chSysLock();

-     r = rand() & 15;

-     chSysUnlock();

-     while (r--)

-       x++;

-   }

-#else

-   /* Fixed delay.*/

-   {

-     r = me >> 4;

-     while (r--)

-       x++;

-   }

-#endif

-

-    /* Deciding in which direction to re-send the message.*/

-    if (msg == MSG_SEND_LEFT)

-      target = me - 1;

-    else

-      target = me + 1;

-

-    if (target < NUM_THREADS) {

-      /* If this thread is not at the end of a chain re-sending the message,

-         note this check works because the variable target is unsigned.*/

-      msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

-        saturated = TRUE;

-    }

-    else {

-      /* Provides a visual feedback about the system.*/

-      if (++cnt >= 500) {

-        cnt = 0;

-        palTogglePad(GPIO0, GPIO0_LED2);

-      }

-    }

-  }

-}

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt1cb    /* Timer callback.*/

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt2cb    /* Timer callback.*/

-};

-

-

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

-/* Generic demo code.                                                        */

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

-

-static void print(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-}

-

-static void println(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-  chSequentialStreamWrite(&SD1, (uint8_t *)"\r\n", 2);

-}

-

-static void printn(uint32_t n) {

-  char buf[16], *p;

-

-  if (!n)

-    chSequentialStreamPut(&SD1, '0');

-  else {

-    p = buf;

-    while (n)

-      *p++ = (n % 10) + '0', n /= 10;

-    while (p > buf)

-      chSequentialStreamPut(&SD1, *--p);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-  gptcnt_t interval, threshold, worst;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

-

-  /*

-   * Initializes the mailboxes and creates the worker threads.

-   */

-  for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

-    chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

-                      NORMALPRIO - 20, WorkerThread, (void *)i);

-  }

-

-  /*

-   * Test procedure.

-   */

-  println("");

-  println("*** ChibiOS/RT IRQ-STORM long duration test");

-  println("***");

-  print("*** Kernel:       ");

-  println(CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

-#endif

-  print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

-#endif

-#ifdef CH_PORT_INFO

-  print("*** Port Info:    ");

-  println(CH_PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  print("*** Platform:     ");

-  println(PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  print("*** Test Board:   ");

-  println(BOARD_NAME);

-#endif

-  println("***");

-  print("*** System Clock: ");

-  printn(LPC11xx_SYSCLK);

-  println("");

-  print("*** Iterations:   ");

-  printn(ITERATIONS);

-  println("");

-  print("*** Randomize:    ");

-  printn(RANDOMIZE);

-  println("");

-  print("*** Threads:      ");

-  printn(NUM_THREADS);

-  println("");

-  print("*** Mailbox size: ");

-  printn(MAILBOX_SIZE);

-  println("");

-

-  println("");

-  worst = 0;

-  for (i = 1; i <= ITERATIONS; i++){

-    print("Iteration ");

-    printn(i);

-    println("");

-    saturated = FALSE;

-    threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

-      chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

-      if (!saturated)

-        print(".");

-      else {

-        print("#");

-        if (threshold == 0)

-          threshold = interval;

-      }

-    }

-    /* Gives the worker threads a chance to empty the mailboxes before next

-       cycle.*/

-    chThdSleepMilliseconds(20);

-    println("");

-    print("Saturated at ");

-    printn(threshold);

-    println(" uS");

-    println("");

-    if (threshold > worst)

-      worst = threshold;

-  }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

-

-  print("Worst case at ");

-  printn(worst);

-  println(" uS");

-  println("");

-  println("Test Complete");

-

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-  }

-  return 0;

-}

diff --git a/testhal/LPC11xx/IRQ_STORM/mcuconf.h b/testhal/LPC11xx/IRQ_STORM/mcuconf.h
deleted file mode 100644
index 6db2e6fd2..000000000
--- a/testhal/LPC11xx/IRQ_STORM/mcuconf.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1114 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC11xx_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC11xx_SYSPLL_MUL                  4

-#define LPC11xx_SYSPLL_DIV                  4

-#define LPC11xx_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC11xx_SYSABHCLK_DIV               1

-

-/*

- * ADC driver system settings.

- */

-

-/*

- * CAN driver system settings.

- */

-

-/*

- * GPT driver system settings.

- */

-#define LPC11xx_GPT_USE_CT16B0              TRUE

-#define LPC11xx_GPT_USE_CT16B1              TRUE

-#define LPC11xx_GPT_USE_CT32B0              TRUE

-#define LPC11xx_GPT_USE_CT32B1              TRUE

-#define LPC11xx_GPT_CT16B0_IRQ_PRIORITY     1

-#define LPC11xx_GPT_CT16B1_IRQ_PRIORITY     3

-#define LPC11xx_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC11xx_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * PWM driver system settings.

- */

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC11xx_SERIAL_USE_UART0            TRUE

-#define LPC11xx_SERIAL_FIFO_PRELOAD         16

-#define LPC11xx_SERIAL_UART0CLKDIV          1

-#define LPC11xx_SERIAL_UART0_IRQ_PRIORITY   3

-

-/*

- * SPI driver system settings.

- */

-#define LPC11xx_SPI_USE_SSP0                TRUE

-#define LPC11xx_SPI_USE_SSP1                FALSE

-#define LPC11xx_SPI_SSP0CLKDIV              1

-#define LPC11xx_SPI_SSP1CLKDIV              1

-#define LPC11xx_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP1_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-#define LPC11xx_SPI_SCK0_SELECTOR           SCK0_IS_PIO2_11

diff --git a/testhal/LPC11xx/IRQ_STORM/readme.txt b/testhal/LPC11xx/IRQ_STORM/readme.txt
deleted file mode 100644
index aa22b8f39..000000000
--- a/testhal/LPC11xx/IRQ_STORM/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - IRQ-STORM demo for LPC11xx.                            **

-*****************************************************************************

-

-** TARGET **

-

-The demo will on an LPCXpresso LPC1114 board.

-

-** The Demo **

-

-The application demonstrates the use of the LPC11xx GPT, PAL and Serial drivers

-in order to implement a system stress demo.

-

-** Build Procedure **

-

-The demo has been tested using the free LPCXpresso toolchain but also with

-Codesourcery and YAGARTO.

-Just modify the TRGT line in the makefile in order to use different GCC ports.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-NXP and are licensed under a different license.

-

-                             http://www.nxp.com

diff --git a/testhal/LPC11xx/PWM/Makefile b/testhal/LPC11xx/PWM/Makefile
deleted file mode 100644
index 2ad18e131..000000000
--- a/testhal/LPC11xx/PWM/Makefile
+++ /dev/null
@@ -1,194 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

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

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

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

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

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

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC11C24.ld

-

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

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       main.c

-

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

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

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

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

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1114 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

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

diff --git a/testhal/LPC11xx/PWM/chconf.h b/testhal/LPC11xx/PWM/chconf.h
deleted file mode 100644
index feb364424..000000000
--- a/testhal/LPC11xx/PWM/chconf.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

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

-/**

- * @name Kernel parameters and options

- * @{

- */

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

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

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

- */

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

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

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

- */

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

-#define CH_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

-#endif

-

-/** @} */

-

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

-/**

- * @name Performance options

- * @{

- */

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

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

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

-#endif

-

-/** @} */

-

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

-/**

- * @name Subsystem options

- * @{

- */

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

-

-/**

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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

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

- */

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

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

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

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

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

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

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

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

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

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

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

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

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

- */

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

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/PWM/halconf.h b/testhal/LPC11xx/PWM/halconf.h
deleted file mode 100644
index 78b61cf6a..000000000
--- a/testhal/LPC11xx/PWM/halconf.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC11xx/PWM/main.c b/testhal/LPC11xx/PWM/main.c
deleted file mode 100644
index 1ce05966f..000000000
--- a/testhal/LPC11xx/PWM/main.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwm2pcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(GPIO0, GPIO0_LED);

-}

-

-static void pwm2c0cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(GPIO0, GPIO0_LED);

-}

-

-static PWMConfig pwmcfg = {

-  10000,                                    /* 10kHz PWM clock frequency.   */

-  1000,                                     /* Initial PWM period 4,8us     */

-  pwm2pcb,

-  {

-   {PWM_OUTPUT_ACTIVE_LOW, pwm2c0cb},

-   {PWM_OUTPUT_ACTIVE_LOW, NULL}

-  }

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes the PWM driver 2.

-   */

-  pwmStart(&PWMD2, &pwmcfg);

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 1 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 250);

-  pwmEnableChannel(&PWMD2, 1, 250);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 1 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 500);

-  pwmEnableChannel(&PWMD2, 1, 500);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 250);

-  pwmEnableChannel(&PWMD2, 1, 250);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period to half second the duty cycle becomes 50%

-   * implicitly.

-   */

-  pwmChangePeriod(&PWMD2, 500);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables channel 1.

-   */

-  pwmDisableChannel(&PWMD2, 1);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/LPC11xx/PWM/mcuconf.h b/testhal/LPC11xx/PWM/mcuconf.h
deleted file mode 100644
index 21f8c6693..000000000
--- a/testhal/LPC11xx/PWM/mcuconf.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC11xx EXT driver - Copyright (C) 2013 Marcin Jokel

-                       - Copyright (C) 2013 mike brown

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1114 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC11xx_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC11xx_SYSPLL_MUL                  4

-#define LPC11xx_SYSPLL_DIV                  4

-#define LPC11xx_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC11xx_SYSABHCLK_DIV               1

-

-/*

- * GPT driver system settings.

- */

-#define LPC11xx_GPT_USE_CT16B0              FALSE

-#define LPC11xx_GPT_USE_CT16B1              FALSE

-#define LPC11xx_GPT_USE_CT32B0              FALSE

-#define LPC11xx_GPT_USE_CT32B1              FALSE

-#define LPC11xx_GPT_CT16B0_IRQ_PRIORITY     1

-#define LPC11xx_GPT_CT16B1_IRQ_PRIORITY     3

-#define LPC11xx_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC11xx_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC11xx_SERIAL_USE_UART0            TRUE

-#define LPC11xx_SERIAL_FIFO_PRELOAD         16

-#define LPC11xx_SERIAL_UART0CLKDIV          1

-#define LPC11xx_SERIAL_UART0_IRQ_PRIORITY   3

-

-/*

- * SPI driver system settings.

- */

-#define LPC11xx_SPI_USE_SSP0                TRUE

-#define LPC11xx_SPI_USE_SSP1                FALSE

-#define LPC11xx_SPI_SSP0CLKDIV              1

-#define LPC11xx_SPI_SSP1CLKDIV              1

-#define LPC11xx_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP1_IRQ_PRIORITY       1

-#define LPC11xx_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-#define LPC11xx_SPI_SCK0_SELECTOR           SCK0_IS_PIO2_11

-

-/*

- * EXT driver system settings.

- */

-#define LPC11xx_EXT_USE_EXT0                FALSE

-#define LPC11xx_EXT_USE_EXT1                FALSE

-#define LPC11xx_EXT_USE_EXT2                FALSE

-#define LPC11xx_EXT_USE_EXT3                FALSE

-#define LPC11xx_EXT_EXTI0_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI1_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI2_IRQ_PRIORITY      3

-#define LPC11xx_EXT_EXTI3_IRQ_PRIORITY      3

-

-/*

- * I2C driver system settings.

- */

-#define LPC11xx_I2C_IRQ_PRIORITY            3

-

-/*

- * PWM driver system settings.

- */

-#define LPC11xx_PWM_USE_CT16B0              FALSE

-#define LPC11xx_PWM_USE_CT16B1              TRUE

-#define LPC11xx_PWM_USE_CT32B0              FALSE

-#define LPC11xx_PWM_USE_CT32B1              FALSE

-#define LPC11xx_PWM_USE_CT16B0_CH0          FALSE

-#define LPC11xx_PWM_USE_CT16B0_CH1          FALSE

-#define LPC11xx_PWM_USE_CT16B1_CH0          TRUE

-#define LPC11xx_PWM_USE_CT16B1_CH1          TRUE

-#define LPC11xx_PWM_USE_CT32B0_CH0          FALSE

-#define LPC11xx_PWM_USE_CT32B0_CH1          FALSE

-#define LPC11xx_PWM_USE_CT32B1_CH0          FALSE

-#define LPC11xx_PWM_USE_CT32B1_CH1          FALSE

-#define LPC11xx_PWM_CT16B0_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT16B1_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT32B0_IRQ_PRIORITY     3

-#define LPC11xx_PWM_CT32B1_IRQ_PRIORITY     3

diff --git a/testhal/LPC122x/EXT/Makefile b/testhal/LPC122x/EXT/Makefile
deleted file mode 100644
index 507fe3f00..000000000
--- a/testhal/LPC122x/EXT/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_LPC-P1227/board.mk

-include $(CHIBIOS)/os/hal/platforms/LPC122x/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC122x/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1227.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1227 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/LPC122x/EXT/chconf.h b/testhal/LPC122x/EXT/chconf.h
deleted file mode 100644
index 04ff997d1..000000000
--- a/testhal/LPC122x/EXT/chconf.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/EXT/halconf.h b/testhal/LPC122x/EXT/halconf.h
deleted file mode 100644
index 8cb1fcc41..000000000
--- a/testhal/LPC122x/EXT/halconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 TRUE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/EXT/main.c b/testhal/LPC122x/EXT/main.c
deleted file mode 100644
index 76cafce0e..000000000
--- a/testhal/LPC122x/EXT/main.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void led1off(void *arg) {

-

-  (void)arg;

-  palSetPad(GPIO1, GPIO1_LED1);

-}

-

-/* Triggered when the button is pressed or released. The LED1 is set to ON.*/

-static void ext2cb12(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

-

-  (void)extp;

-  (void)channel;

-

-  palClearPad(GPIO1, GPIO1_LED1);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

-

-  /* LED1 set to OFF after 200mS.*/

-  chVTSetI(&vt4, MS2ST(200), led1off, NULL);

-  chSysUnlockFromIsr();

-}

-

-static const EXTConfig extcfg = {

-  {

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_BOTH_EDGES | EXT_CH_MODE_AUTOSTART, ext2cb12},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL},

-    {EXT_CH_MODE_DISABLED, NULL}

-  }

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the EXT driver 1.

-   */

-  extStart(&EXTD2, &extcfg);

-

-  /*

-   * Normal main() thread activity, in this demo it enables and disables the

-   * button EXT channel using 5 seconds intervals.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-    extChannelDisable(&EXTD2, GPIO2_SW_USER1);

-    chThdSleepMilliseconds(5000);

-    extChannelEnable(&EXTD2, GPIO2_SW_USER1);

-  }

-}

diff --git a/testhal/LPC122x/EXT/mcuconf.h b/testhal/LPC122x/EXT/mcuconf.h
deleted file mode 100644
index 608abf226..000000000
--- a/testhal/LPC122x/EXT/mcuconf.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1227 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC122x_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC122x_SYSPLL_MUL                  3

-#define LPC122x_SYSPLL_DIV                  8

-#define LPC122x_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC122x_SYSABHCLK_DIV               1

-

-/*

- * GPT driver system settings.

- */

-#define LPC122x_GPT_USE_CT16B0              TRUE

-#define LPC122x_GPT_USE_CT16B1              TRUE

-#define LPC122x_GPT_USE_CT32B0              TRUE

-#define LPC122x_GPT_USE_CT32B1              TRUE

-#define LPC122x_GPT_CT16B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT16B1_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC122x_SERIAL_USE_UART0            TRUE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART0CLKDIV          1

-#define LPC122x_SERIAL_UART0_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_TXD0_SELECTOR        TXD0_IS_PIO0_2

-#define LPC122x_SERIAL_RXD0_SELECTOR        RXD0_IS_PIO0_1

-

-#define LPC122x_SERIAL_USE_UART1            FALSE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART1CLKDIV          1

-#define LPC122x_SERIAL_UART1_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_RXD1_SELECTOR        RXD1_IS_PIO0_8

-#define LPC122x_SERIAL_TXD1_SELECTOR        TXD1_IS_PIO0_9

-

-/*

- * SPI driver system settings.

- */

-#define LPC122x_SPI_USE_SSP0                TRUE

-#define LPC122x_SPI_SSP0CLKDIV              1

-#define LPC122x_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC122x_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-

-/*

- * EXT driver system settings.

- */

-#define LPC122x_EXT_USE_EXT0                FALSE

-#define LPC122x_EXT_USE_EXT1                FALSE

-#define LPC122x_EXT_USE_EXT2                TRUE

-#define LPC122x_EXT_EXTI0_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI1_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI2_IRQ_PRIORITY      3

-

-/*

- * RTC driver system settings.

- */

-#define LPC122x_RTCCLK                      SYSCFG_RTCCLK_1Hz

-#define LPC122x_RTC_CLKDIV                  0

-#define LPC122x_RTC_USE_ALARM               TRUE

-#define LPC122x_RTC_IRQ_PRIORITY            3

-

-/*

- * PWM driver system settings.

- */

-#define LPC122x_PWM_USE_CT16B0              FALSE

-#define LPC122x_PWM_USE_CT16B1              TRUE

-#define LPC122x_PWM_USE_CT32B0              FALSE

-#define LPC122x_PWM_USE_CT32B1              FALSE

-#define LPC122x_PWM_USE_CT16B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT16B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT16B1_CH0          TRUE

-#define LPC122x_PWM_USE_CT16B1_CH1          TRUE

-#define LPC122x_PWM_USE_CT32B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH1          FALSE

-#define LPC122x_PWM_CT16B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B0_CH0_SELECTOR     PWM_CT16B0_CH0_IS_PIO0_28

-#define LPC122x_PWM_CT16B0_CH1_SELECTOR     PWM_CT16B0_CH1_IS_PIO0_29

-#define LPC122x_PWM_CT16B1_CH0_SELECTOR     PWM_CT16B1_CH0_IS_PIO1_5

-#define LPC122x_PWM_CT16B1_CH1_SELECTOR     PWM_CT16B1_CH1_IS_PIO1_6

-#define LPC122x_PWM_CT32B0_CH0_SELECTOR     PWM_CT32B0_CH0_IS_PIO2_4

-#define LPC122x_PWM_CT32B0_CH1_SELECTOR     PWM_CT32B0_CH1_IS_PIO0_2

-#define LPC122x_PWM_CT32B1_CH0_SELECTOR     PWM_CT32B1_CH0_IS_PIO0_6

-#define LPC122x_PWM_CT32B1_CH1_SELECTOR     PWM_CT32B1_CH1_IS_PIO0_7

-

-/*

- * I2C driver system settings.

- */

-#define LPC122x_I2C_IRQ_PRIORITY            3

diff --git a/testhal/LPC122x/IRQ_STORM/Makefile b/testhal/LPC122x/IRQ_STORM/Makefile
deleted file mode 100644
index 507fe3f00..000000000
--- a/testhal/LPC122x/IRQ_STORM/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_LPC-P1227/board.mk

-include $(CHIBIOS)/os/hal/platforms/LPC122x/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC122x/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1227.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1227 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/LPC122x/IRQ_STORM/chconf.h b/testhal/LPC122x/IRQ_STORM/chconf.h
deleted file mode 100644
index 04ff997d1..000000000
--- a/testhal/LPC122x/IRQ_STORM/chconf.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/IRQ_STORM/halconf.h b/testhal/LPC122x/IRQ_STORM/halconf.h
deleted file mode 100644
index 9f3179d0c..000000000
--- a/testhal/LPC122x/IRQ_STORM/halconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/IRQ_STORM/main.c b/testhal/LPC122x/IRQ_STORM/main.c
deleted file mode 100644
index ac1c51945..000000000
--- a/testhal/LPC122x/IRQ_STORM/main.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*

-    LPC122x - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-/*===========================================================================*/

-/* Configurable settings.                                                    */

-/*===========================================================================*/

-

-#ifndef RANDOMIZE

-#define RANDOMIZE       FALSE

-#endif

-

-#ifndef ITERATIONS

-#define ITERATIONS      100

-#endif

-

-#ifndef NUM_THREADS

-#define NUM_THREADS     4

-#endif

-

-#ifndef MAILBOX_SIZE

-#define MAILBOX_SIZE    4

-#endif

-

-/*===========================================================================*/

-/* Test related code.                                                        */

-/*===========================================================================*/

-

-#define MSG_SEND_LEFT   0

-#define MSG_SEND_RIGHT  1

-

-static bool_t saturated;

-

-/*

- * Mailboxes and buffers.

- */

-static Mailbox mb[NUM_THREADS];

-static msg_t b[NUM_THREADS][MAILBOX_SIZE];

-

-/*

- * Test worker threads.

- */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

-static msg_t WorkerThread(void *arg) {

-  static volatile unsigned x = 0;

-  static unsigned cnt = 0;

-  unsigned me = (unsigned)arg;

-  unsigned target;

-  unsigned r;

-  msg_t msg;

-

-  chRegSetThreadName("worker");

-

-  /* Work loop.*/

-  while (TRUE) {

-    /* Waiting for a message.*/

-   chMBFetch(&mb[me], &msg, TIME_INFINITE);

-

-#if RANDOMIZE

-   /* Pseudo-random delay.*/

-   {

-     chSysLock();

-     r = rand() & 15;

-     chSysUnlock();

-     while (r--)

-       x++;

-   }

-#else

-   /* Fixed delay.*/

-   {

-     r = me >> 4;

-     while (r--)

-       x++;

-   }

-#endif

-

-    /* Deciding in which direction to re-send the message.*/

-    if (msg == MSG_SEND_LEFT)

-      target = me - 1;

-    else

-      target = me + 1;

-

-    if (target < NUM_THREADS) {

-      /* If this thread is not at the end of a chain re-sending the message,

-         note this check works because the variable target is unsigned.*/

-      msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

-        saturated = TRUE;

-    }

-    else {

-      /* Provides a visual feedback about the system.*/

-      if (++cnt >= 500) {

-        cnt = 0;

-        palTogglePad(GPIO1, GPIO1_LED1);

-      }

-    }

-  }

-}

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt1cb    /* Timer callback.*/

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt2cb    /* Timer callback.*/

-};

-

-

-/*===========================================================================*/

-/* Generic demo code.                                                        */

-/*===========================================================================*/

-

-static void print(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-}

-

-static void println(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-  chSequentialStreamWrite(&SD1, (uint8_t *)"\r\n", 2);

-}

-

-static void printn(uint32_t n) {

-  char buf[16], *p;

-

-  if (!n)

-    chSequentialStreamPut(&SD1, '0');

-  else {

-    p = buf;

-    while (n)

-      *p++ = (n % 10) + '0', n /= 10;

-    while (p > buf)

-      chSequentialStreamPut(&SD1, *--p);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-  gptcnt_t interval, threshold, worst;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

-

-  /*

-   * Initializes the mailboxes and creates the worker threads.

-   */

-  for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

-    chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

-                      NORMALPRIO - 20, WorkerThread, (void *)i);

-  }

-

-  /*

-   * Test procedure.

-   */

-  println("");

-  println("*** ChibiOS/RT IRQ-STORM long duration test");

-  println("***");

-  print("*** Kernel:       ");

-  println(CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

-#endif

-  print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

-#endif

-#ifdef CH_PORT_INFO

-  print("*** Port Info:    ");

-  println(CH_PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  print("*** Platform:     ");

-  println(PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  print("*** Test Board:   ");

-  println(BOARD_NAME);

-#endif

-  println("***");

-  print("*** System Clock: ");

-  printn(LPC122x_SYSCLK);

-  println("");

-  print("*** Iterations:   ");

-  printn(ITERATIONS);

-  println("");

-  print("*** Randomize:    ");

-  printn(RANDOMIZE);

-  println("");

-  print("*** Threads:      ");

-  printn(NUM_THREADS);

-  println("");

-  print("*** Mailbox size: ");

-  printn(MAILBOX_SIZE);

-  println("");

-

-  println("");

-  worst = 0;

-  for (i = 1; i <= ITERATIONS; i++){

-    print("Iteration ");

-    printn(i);

-    println("");

-    saturated = FALSE;

-    threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

-      chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

-      if (!saturated)

-        print(".");

-      else {

-        print("#");

-        if (threshold == 0)

-          threshold = interval;

-      }

-    }

-    /* Gives the worker threads a chance to empty the mailboxes before next

-       cycle.*/

-    chThdSleepMilliseconds(20);

-    println("");

-    print("Saturated at ");

-    printn(threshold);

-    println(" uS");

-    println("");

-    if (threshold > worst)

-      worst = threshold;

-  }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

-

-  print("Worst case at ");

-  printn(worst);

-  println(" uS");

-  println("");

-  println("Test Complete");

-

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-  }

-  return 0;

-}

diff --git a/testhal/LPC122x/IRQ_STORM/mcuconf.h b/testhal/LPC122x/IRQ_STORM/mcuconf.h
deleted file mode 100644
index 3b871766e..000000000
--- a/testhal/LPC122x/IRQ_STORM/mcuconf.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x EXT driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1227 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC122x_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC122x_SYSPLL_MUL                  3

-#define LPC122x_SYSPLL_DIV                  8

-#define LPC122x_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC122x_SYSABHCLK_DIV               1

-

-/*

- * ADC driver system settings.

- */

-

-/*

- * CAN driver system settings.

- */

-

-/*

- * GPT driver system settings.

- */

-#define LPC122x_GPT_USE_CT16B0              TRUE

-#define LPC122x_GPT_USE_CT16B1              TRUE

-#define LPC122x_GPT_USE_CT32B0              TRUE

-#define LPC122x_GPT_USE_CT32B1              TRUE

-#define LPC122x_GPT_CT16B0_IRQ_PRIORITY     1

-#define LPC122x_GPT_CT16B1_IRQ_PRIORITY     3

-#define LPC122x_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * PWM driver system settings.

- */

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC122x_SERIAL_USE_UART0            TRUE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART0CLKDIV          1

-#define LPC122x_SERIAL_UART0_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_TXD0_SELECTOR        TXD0_IS_PIO0_2

-#define LPC122x_SERIAL_RXD0_SELECTOR        RXD0_IS_PIO0_1

-

-#define LPC122x_SERIAL_USE_UART1            FALSE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART1CLKDIV          1

-#define LPC122x_SERIAL_UART1_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_RXD1_SELECTOR        RXD1_IS_PIO0_8

-#define LPC122x_SERIAL_TXD1_SELECTOR        TXD1_IS_PIO0_9

-

-/*

- * SPI driver system settings.

- */

-#define LPC122x_SPI_USE_SSP0                TRUE

-#define LPC122x_SPI_SSP0CLKDIV              1

-#define LPC122x_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC122x_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

diff --git a/testhal/LPC122x/IRQ_STORM/readme.txt b/testhal/LPC122x/IRQ_STORM/readme.txt
deleted file mode 100644
index 58f143f05..000000000
--- a/testhal/LPC122x/IRQ_STORM/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - IRQ-STORM demo for LPC122x.                            **

-*****************************************************************************

-

-** TARGET **

-

-The demo will on an LPCXpresso LPC1114 board.

-

-** The Demo **

-

-The application demonstrates the use of the LPC11xx GPT, PAL and Serial drivers

-in order to implement a system stress demo.

-

-** Build Procedure **

-

-The demo has been tested using the free LPCXpresso toolchain but also with

-Codesourcery and YAGARTO.

-Just modify the TRGT line in the makefile in order to use different GCC ports.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-NXP and are licensed under a different license.

-

-                             http://www.nxp.com

diff --git a/testhal/LPC122x/PWM/Makefile b/testhal/LPC122x/PWM/Makefile
deleted file mode 100644
index 16eff2811..000000000
--- a/testhal/LPC122x/PWM/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_LPC-P1227/board.mk

-include $(CHIBIOS)/os/hal/platforms/LPC122x/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC122x/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1227.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c  \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1227 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/LPC122x/PWM/chconf.h b/testhal/LPC122x/PWM/chconf.h
deleted file mode 100644
index b5126732f..000000000
--- a/testhal/LPC122x/PWM/chconf.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x PWM driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/PWM/halconf.h b/testhal/LPC122x/PWM/halconf.h
deleted file mode 100644
index 945da9669..000000000
--- a/testhal/LPC122x/PWM/halconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x PWM driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/PWM/main.c b/testhal/LPC122x/PWM/main.c
deleted file mode 100644
index eb8abb951..000000000
--- a/testhal/LPC122x/PWM/main.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x PWM driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwm2pcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(GPIO1, GPIO1_LED2);

-}

-

-static void pwm2c0cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(GPIO1, GPIO1_LED2);

-}

-

-static PWMConfig pwmcfg = {

-  10000,                                    /* 100kHz PWM clock frequency.   */

-  1000,                                     /* PWM 10 Hz    */

-  pwm2pcb,

-  {

-   {PWM_OUTPUT_ACTIVE_LOW, pwm2c0cb},

-   {PWM_OUTPUT_ACTIVE_LOW, NULL}

-  }

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes the PWM driver 2.

-   */

-  pwmStart(&PWMD2, &pwmcfg);

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 1 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 250);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 1 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 500);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD2, 0, 250);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period to half second the duty cycle becomes 50%

-   * implicitly.

-   */

-  pwmChangePeriod(&PWMD2, 500);

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/LPC122x/PWM/mcuconf.h b/testhal/LPC122x/PWM/mcuconf.h
deleted file mode 100644
index b4a308c7a..000000000
--- a/testhal/LPC122x/PWM/mcuconf.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x PWM driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1227 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC122x_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC122x_SYSPLL_MUL                  3

-#define LPC122x_SYSPLL_DIV                  8

-#define LPC122x_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC122x_SYSABHCLK_DIV               1

-

-/*

- * GPT driver system settings.

- */

-#define LPC122x_GPT_USE_CT16B0              TRUE

-#define LPC122x_GPT_USE_CT16B1              TRUE

-#define LPC122x_GPT_USE_CT32B0              TRUE

-#define LPC122x_GPT_USE_CT32B1              TRUE

-#define LPC122x_GPT_CT16B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT16B1_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC122x_SERIAL_USE_UART0            TRUE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART0CLKDIV          1

-#define LPC122x_SERIAL_UART0_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_TXD0_SELECTOR        TXD0_IS_PIO0_2

-#define LPC122x_SERIAL_RXD0_SELECTOR        RXD0_IS_PIO0_1

-

-#define LPC122x_SERIAL_USE_UART1            FALSE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART1CLKDIV          1

-#define LPC122x_SERIAL_UART1_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_RXD1_SELECTOR        RXD1_IS_PIO0_8

-#define LPC122x_SERIAL_TXD1_SELECTOR        TXD1_IS_PIO0_9

-

-/*

- * SPI driver system settings.

- */

-#define LPC122x_SPI_USE_SSP0                TRUE

-#define LPC122x_SPI_SSP0CLKDIV              1

-#define LPC122x_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC122x_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-

-/*

- * EXT driver system settings.

- */

-#define LPC122x_EXT_USE_EXT0                FALSE

-#define LPC122x_EXT_USE_EXT1                FALSE

-#define LPC122x_EXT_USE_EXT2                TRUE

-#define LPC122x_EXT_EXTI0_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI1_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI2_IRQ_PRIORITY      3

-

-/*

- * RTC driver system settings.

- */

-#define LPC122x_RTCCLK                      SYSCFG_RTCCLK_1Hz

-#define LPC122x_RTC_CLKDIV                  0

-#define LPC122x_RTC_USE_ALARM               TRUE

-#define LPC122x_RTC_IRQ_PRIORITY            3

-

-/*

- * PWM driver system settings.

- */

-#define LPC122x_PWM_USE_CT16B0              FALSE

-#define LPC122x_PWM_USE_CT16B1              TRUE

-#define LPC122x_PWM_USE_CT32B0              FALSE

-#define LPC122x_PWM_USE_CT32B1              FALSE

-#define LPC122x_PWM_USE_CT16B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT16B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT16B1_CH0          TRUE

-#define LPC122x_PWM_USE_CT16B1_CH1          TRUE

-#define LPC122x_PWM_USE_CT32B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH1          FALSE

-#define LPC122x_PWM_CT16B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B0_CH0_SELECTOR     PWM_CT16B0_CH0_IS_PIO0_28

-#define LPC122x_PWM_CT16B0_CH1_SELECTOR     PWM_CT16B0_CH1_IS_PIO0_29

-#define LPC122x_PWM_CT16B1_CH0_SELECTOR     PWM_CT16B1_CH0_IS_PIO2_2

-#define LPC122x_PWM_CT16B1_CH1_SELECTOR     PWM_CT16B1_CH1_IS_PIO1_6

-#define LPC122x_PWM_CT32B0_CH0_SELECTOR     PWM_CT32B0_CH0_IS_PIO2_4

-#define LPC122x_PWM_CT32B0_CH1_SELECTOR     PWM_CT32B0_CH1_IS_PIO0_2

-#define LPC122x_PWM_CT32B1_CH0_SELECTOR     PWM_CT32B1_CH0_IS_PIO0_6

-#define LPC122x_PWM_CT32B1_CH1_SELECTOR     PWM_CT32B1_CH1_IS_PIO0_7

-

-/*

- * I2C driver system settings.

- */

-#define LPC122x_I2C_IRQ_PRIORITY            3

diff --git a/testhal/LPC122x/RTC/Makefile b/testhal/LPC122x/RTC/Makefile
deleted file mode 100644
index 7b0b90b17..000000000
--- a/testhal/LPC122x/RTC/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_LPC-P1227/board.mk

-include $(CHIBIOS)/os/hal/platforms/LPC122x/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC122x/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1227.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       $(CHIBIOS)/os/various/chrtclib.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m0

-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC122X -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/LPC122x/RTC/chconf.h b/testhal/LPC122x/RTC/chconf.h
deleted file mode 100644
index 120d2b7d5..000000000
--- a/testhal/LPC122x/RTC/chconf.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x RTC driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/RTC/halconf.h b/testhal/LPC122x/RTC/halconf.h
deleted file mode 100644
index b9195a6dc..000000000
--- a/testhal/LPC122x/RTC/halconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x RTC driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC122x/RTC/main.c b/testhal/LPC122x/RTC/main.c
deleted file mode 100644
index c9cf9dab0..000000000
--- a/testhal/LPC122x/RTC/main.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x RTC driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

-This structure is used to hold the values representing a calendar time.

-It contains the following members, with the meanings as shown.

-

-int tm_sec       seconds after minute [0-61] (61 allows for 2 leap-seconds)

-int tm_min       minutes after hour [0-59]

-int tm_hour      hours after midnight [0-23]

-int tm_mday      day of the month [1-31]

-int tm_mon       month of year [0-11]

-int tm_year      current year-1900

-int tm_wday      days since Sunday [0-6]

-int tm_yday      days since January 1st [0-365]

-int tm_isdst     daylight savings indicator (1 = yes, 0 = no, -1 = unknown)

-*/

-

-#include <string.h>

-#include <stdlib.h>

-#include <time.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "shell.h"

-#include "chprintf.h"

-#include "chrtclib.h"

-

-static RTCAlarm alarmspec;

-static time_t unix_time;

-

-/* libc stub */

-int _getpid(void) {return 1;}

-/* libc stub */

-void _exit(int i) {(void)i;}

-/* libc stub */

-#include <errno.h>

-#undef errno

-extern int errno;

-int _kill(int pid, int sig) {

-  (void)pid;

-  (void)sig;

-  errno = EINVAL;

-  return -1;

-}

-

-

-/* sleep indicator thread */

-static WORKING_AREA(blinkWA, 128);

-static msg_t blink_thd(void *arg){

-  (void)arg;

-  while (TRUE) {

-    chThdSleepMilliseconds(100);

-    palTogglePad(GPIO1, GPIO1_LED1);

-  }

-  return 0;

-}

-

-static void wakeup_cb(RTCDriver *rtcp, rtcevent_t event) {

-

-  (void)rtcp;

-

-  if (event == RTC_EVENT_ALARM) {

-    palTogglePad(GPIO1, GPIO1_LED2);

-  }

-}

-

-/* Wake-up from Deep-sleep mode with rtc alarm (must be set first) */

-static void func_sleep(void) {

-

-  chSysLock();

-

-  /* Deep sleep-mode configuration */

-  LPC_PMU->PCON = 0;                              /* DPDEN bit set to 0 */

-  LPC_SYSCON->PDSLEEPCFG = 0x0000FFBF;            /* BOD off,  wdt osc on */

-  LPC_SYSCON->PDAWAKECFG &= ~(1 << 6);            /* WDT osc powered after woke */

-  SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;              /* Deep sleep mode */

-

-  /* WDT osc config and run */

-  LPC_SYSCON->PDRUNCFG |= (1 << 6);               /* WDT oscillator power-down */

-  LPC_SYSCON->WDTOSCCTRL = (0x01 << 5 ) | 0;      /* wdt_osc_clk = Fclkana/(2 * (1 + DIVSEL)) */

-  LPC_SYSCON->PDRUNCFG &= ~(1 << 6);              /* WDT oscillator power-up */

-  __NOP();

-

-  /* Set WDT osc as Main Clock*/

-  LPC_SYSCON->MAINCLKSEL = SYSMAINCLKSEL_WDGOSC;

-  LPC_SYSCON->MAINCLKUEN = 1;                     /* Really required?         */

-  LPC_SYSCON->MAINCLKUEN = 0;

-  LPC_SYSCON->MAINCLKUEN = 1;

-  while ((LPC_SYSCON->MAINCLKUEN & 1) == 0)       /* Wait switch completion.  */

-    ;

-

-  /* Set RTC start logic */

-  LPC_SYSCON->STARTAPRP1 = (1UL << 18);           /* Rising edge */

-  LPC_SYSCON->STARTERP1 = (1UL << 18);            /* Enable Start Logic for RTC interrupt */

-

-  __WFI();

-

-  NVIC_SystemReset();

-}

-

-/* Wake-up from Deep power-down with wake-up pin or rtc alarm (must be set first) */

-static void func_pwrdown(void) {

-

-  chSysLock();

-

-  LPC_PMU->PCON |= (1UL << 1);                    /* DPDEN bit set to 1. */

-  SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;              /* Deep sleep mode. */

-  LPC_SYSCON->PDRUNCFG &= ~((1UL << 1) | 1UL);    /* IRC osc powered. */

-

-  __WFI();

-}

-

-static void cmd_pwrdown(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-

-  if (argc > 0) {

-    chprintf(chp, "Usage: pwrdown\r\n");

-    return;

-  }

-  chprintf(chp, "Going to power down.\r\n");

-

-  chThdSleepMilliseconds(200);

-

-  func_pwrdown();

-

-}

-

-static void cmd_sleep(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-  if (argc > 0) {

-    chprintf(chp, "Usage: sleep\r\n");

-    return;

-  }

-  chprintf(chp, "Going to sleep.\r\n");

-

-  chThdSleepMilliseconds(200);

-

-  /* going to anabiosis */

-  func_sleep();

-}

-

-/*

- *

- */

-static void cmd_alarm(BaseSequentialStream *chp, int argc, char *argv[]){

-

-  (void)argv;

-  if (argc < 1) {

-    goto ERROR;

-  }

-

-  if ((argc == 1) && (strcmp(argv[0], "get") == 0)){

-    rtcGetAlarm(&RTCD1, 0, &alarmspec);

-    chprintf(chp, "%D%s",alarmspec.tv_sec," - alarm in seconds\r\n");

-    return;

-  }

-

-  if ((argc == 2) && (strcmp(argv[0], "set") == 0)){

-    alarmspec.tv_sec = (uint32_t)atol(argv[1]);

-    rtcSetAlarm(&RTCD1, 0, &alarmspec);

-    rtcSetCallback(&RTCD1, wakeup_cb);

-    return;

-  }

-  else{

-    goto ERROR;

-  }

-

-ERROR:

-  chprintf(chp, "Usage: alarm get\r\n");

-  chprintf(chp, "       alarm set N\r\n");

-  chprintf(chp, "where N is alarm time in seconds\r\n");

-}

-

-/*

- *

- */

-static void cmd_date(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-  struct tm timp;

-

-  if (argc == 0) {

-    goto ERROR;

-  }

-

-  if ((argc == 1) && (strcmp(argv[0], "get") == 0)){

-    unix_time = rtcGetTimeUnixSec(&RTCD1);

-

-    if (unix_time == -1){

-      chprintf(chp, "incorrect time in RTC cell\r\n");

-    }

-    else{

-      chprintf(chp, "%D%s",unix_time," - unix time\r\n");

-      rtcGetTimeTm(&RTCD1, &timp);

-      chprintf(chp, "%s%s",asctime(&timp)," - formatted time string\r\n");

-    }

-    return;

-  }

-

-  if ((argc == 2) && (strcmp(argv[0], "set") == 0)){

-    unix_time = atol(argv[1]);

-    if (unix_time > 0){

-      rtcSetTimeUnixSec(&RTCD1, unix_time);

-      return;

-    }

-    else{

-      goto ERROR;

-    }

-  }

-  else{

-    goto ERROR;

-  }

-

-ERROR:

-  chprintf(chp, "Usage: date get\r\n");

-  chprintf(chp, "       date set N\r\n");

-  chprintf(chp, "where N is time in seconds sins Unix epoch\r\n");

-  chprintf(chp, "you can get current N value from unix console by the command\r\n");

-  chprintf(chp, "%s", "date +\%s\r\n");

-  return;

-}

-

-static const ShellCommand commands[] = {

-  {"alarm", cmd_alarm},

-  {"date",  cmd_date},

-  {"sleep", cmd_sleep},

-  {"pwrdown", cmd_pwrdown},

-  {NULL, NULL}

-};

-

-static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream  *)&SD1,

-  commands

-};

-

-BaseSequentialStream  * chp1 = (BaseSequentialStream  *)&SD1;

-

-/**

- * Main function.

- */

-int main(void){

-

-  halInit();

-  chSysInit();

-  chThdCreateStatic(blinkWA, sizeof(blinkWA), NORMALPRIO, blink_thd, NULL);

-

-  sdStart(&SD1, NULL);        /* Default is 38400-8-N-1.*/

-

-  if (LPC_PMU->PCON & (1UL << 11)) {

-    chprintf(chp1, "Woke from Deep power-down\r\n");

-    LPC_PMU->PCON |= (1 << 11);

-  }

-

-  if (LPC_PMU->PCON & (1UL << 8)) {

-    chprintf(chp1, "Woke from Deep-sleep mode\r\n");

-    LPC_PMU->PCON |= (1 << 8);

-  }

-

-  /* Shell initialization.*/

-  shellInit();

-  static WORKING_AREA(waShell, 1024);

-  shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO);

-

-  /* wait until user do not want to test wakeup */

-  while (TRUE){

-    chThdSleepMilliseconds(200);

-  }

-  return 0;

-}

-

-

diff --git a/testhal/LPC122x/RTC/mcuconf.h b/testhal/LPC122x/RTC/mcuconf.h
deleted file mode 100644
index 16519cb51..000000000
--- a/testhal/LPC122x/RTC/mcuconf.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-    LPC122x RTC driver - Copyright (C) 2013 Marcin Jokel

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC1227 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 3...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC122x_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC122x_SYSPLL_MUL                  3

-#define LPC122x_SYSPLL_DIV                  8

-#define LPC122x_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC122x_SYSABHCLK_DIV               1

-

-/*

- * GPT driver system settings.

- */

-#define LPC122x_GPT_USE_CT16B0              TRUE

-#define LPC122x_GPT_USE_CT16B1              TRUE

-#define LPC122x_GPT_USE_CT32B0              TRUE

-#define LPC122x_GPT_USE_CT32B1              TRUE

-#define LPC122x_GPT_CT16B0_IRQ_PRIORITY     1

-#define LPC122x_GPT_CT16B1_IRQ_PRIORITY     3

-#define LPC122x_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC122x_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC122x_SERIAL_USE_UART0            TRUE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART0CLKDIV          1

-#define LPC122x_SERIAL_UART0_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_TXD0_SELECTOR        TXD0_IS_PIO0_2

-#define LPC122x_SERIAL_RXD0_SELECTOR        RXD0_IS_PIO0_1

-

-#define LPC122x_SERIAL_USE_UART1            FALSE

-#define LPC122x_SERIAL_FIFO_PRELOAD         16

-#define LPC122x_SERIAL_UART1CLKDIV          1

-#define LPC122x_SERIAL_UART1_IRQ_PRIORITY   3

-#define LPC122x_SERIAL_RXD1_SELECTOR        RXD1_IS_PIO0_8

-#define LPC122x_SERIAL_TXD1_SELECTOR        TXD1_IS_PIO0_9

-

-/*

- * SPI driver system settings.

- */

-#define LPC122x_SPI_USE_SSP0                TRUE

-#define LPC122x_SPI_SSP0CLKDIV              1

-#define LPC122x_SPI_SSP0_IRQ_PRIORITY       1

-#define LPC122x_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-

-/*

- * EXT driver system settings.

- */

-#define LPC122x_EXT_USE_EXT0                FALSE

-#define LPC122x_EXT_USE_EXT1                FALSE

-#define LPC122x_EXT_USE_EXT2                TRUE

-#define LPC122x_EXT_EXTI0_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI1_IRQ_PRIORITY      3

-#define LPC122x_EXT_EXTI2_IRQ_PRIORITY      3

-

-/*

- * RTC driver system settings.

- */

-#define LPC122x_RTCCLK                      SYSCFG_RTCCLK_1Hz

-#define LPC122x_RTC_CLKDIV                  0

-#define LPC122x_RTC_USE_ALARM               TRUE

-#define LPC122x_RTC_IRQ_PRIORITY            3

-

-/*

- * PWM driver system settings.

- */

-#define LPC122x_PWM_USE_CT16B0              FALSE

-#define LPC122x_PWM_USE_CT16B1              TRUE

-#define LPC122x_PWM_USE_CT32B0              FALSE

-#define LPC122x_PWM_USE_CT32B1              FALSE

-#define LPC122x_PWM_USE_CT16B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT16B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT16B1_CH0          TRUE

-#define LPC122x_PWM_USE_CT16B1_CH1          TRUE

-#define LPC122x_PWM_USE_CT32B0_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B0_CH1          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH0          FALSE

-#define LPC122x_PWM_USE_CT32B1_CH1          FALSE

-#define LPC122x_PWM_CT16B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B0_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT32B1_IRQ_PRIORITY     3

-#define LPC122x_PWM_CT16B0_CH0_SELECTOR     PWM_CT16B0_CH0_IS_PIO0_28

-#define LPC122x_PWM_CT16B0_CH1_SELECTOR     PWM_CT16B0_CH1_IS_PIO0_29

-#define LPC122x_PWM_CT16B1_CH0_SELECTOR     PWM_CT16B1_CH0_IS_PIO1_5

-#define LPC122x_PWM_CT16B1_CH1_SELECTOR     PWM_CT16B1_CH1_IS_PIO1_6

-#define LPC122x_PWM_CT32B0_CH0_SELECTOR     PWM_CT32B0_CH0_IS_PIO2_4

-#define LPC122x_PWM_CT32B0_CH1_SELECTOR     PWM_CT32B0_CH1_IS_PIO0_2

-#define LPC122x_PWM_CT32B1_CH0_SELECTOR     PWM_CT32B1_CH0_IS_PIO0_6

-#define LPC122x_PWM_CT32B1_CH1_SELECTOR     PWM_CT32B1_CH1_IS_PIO0_7

-

-/*

- * I2C driver system settings.

- */

-#define LPC122x_I2C_IRQ_PRIORITY            3

diff --git a/testhal/LPC13xx/IRQ_STORM/Makefile b/testhal/LPC13xx/IRQ_STORM/Makefile
deleted file mode 100644
index 081579754..000000000
--- a/testhal/LPC13xx/IRQ_STORM/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/EA_LPCXPRESSO_BB_1343/board.mk

-include $(CHIBIOS)/os/hal/platforms/LPC13xx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC13xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/LPC1343.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m3

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS = -DLPC1348 -D__NEWLIB__

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/LPC13xx/IRQ_STORM/chconf.h b/testhal/LPC13xx/IRQ_STORM/chconf.h
deleted file mode 100644
index f943ea80c..000000000
--- a/testhal/LPC13xx/IRQ_STORM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC13xx/IRQ_STORM/halconf.h b/testhal/LPC13xx/IRQ_STORM/halconf.h
deleted file mode 100644
index d91a792b4..000000000
--- a/testhal/LPC13xx/IRQ_STORM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/LPC13xx/IRQ_STORM/main.c b/testhal/LPC13xx/IRQ_STORM/main.c
deleted file mode 100644
index b9c2f0274..000000000
--- a/testhal/LPC13xx/IRQ_STORM/main.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-/*===========================================================================*/

-/* Configurable settings.                                                    */

-/*===========================================================================*/

-

-#ifndef RANDOMIZE

-#define RANDOMIZE       FALSE

-#endif

-

-#ifndef ITERATIONS

-#define ITERATIONS      100

-#endif

-

-#ifndef NUM_THREADS

-#define NUM_THREADS     4

-#endif

-

-#ifndef MAILBOX_SIZE

-#define MAILBOX_SIZE    4

-#endif

-

-/*===========================================================================*/

-/* Test related code.                                                        */

-/*===========================================================================*/

-

-#define MSG_SEND_LEFT   0

-#define MSG_SEND_RIGHT  1

-

-static bool_t saturated;

-

-/*

- * Mailboxes and buffers.

- */

-static Mailbox mb[NUM_THREADS];

-static msg_t b[NUM_THREADS][MAILBOX_SIZE];

-

-/*

- * Test worker threads.

- */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

-static msg_t WorkerThread(void *arg) {

-  static volatile unsigned x = 0;

-  static unsigned cnt = 0;

-  unsigned me = (unsigned)arg;

-  unsigned target;

-  unsigned r;

-  msg_t msg;

-

-  chRegSetThreadName("worker");

-

-  /* Work loop.*/

-  while (TRUE) {

-    /* Waiting for a message.*/

-   chMBFetch(&mb[me], &msg, TIME_INFINITE);

-

-#if RANDOMIZE

-   /* Pseudo-random delay.*/

-   {

-     chSysLock();

-     r = rand() & 15;

-     chSysUnlock();

-     while (r--)

-       x++;

-   }

-#else

-   /* Fixed delay.*/

-   {

-     r = me >> 4;

-     while (r--)

-       x++;

-   }

-#endif

-

-    /* Deciding in which direction to re-send the message.*/

-    if (msg == MSG_SEND_LEFT)

-      target = me - 1;

-    else

-      target = me + 1;

-

-    if (target < NUM_THREADS) {

-      /* If this thread is not at the end of a chain re-sending the message,

-         note this check works because the variable target is unsigned.*/

-      msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

-        saturated = TRUE;

-    }

-    else {

-      /* Provides a visual feedback about the system.*/

-      if (++cnt >= 500) {

-        cnt = 0;

-        palTogglePad(GPIO0, GPIO0_LED2);

-      }

-    }

-  }

-}

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt1cb    /* Timer callback.*/

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt2cb    /* Timer callback.*/

-};

-

-

-/*===========================================================================*/

-/* Generic demo code.                                                        */

-/*===========================================================================*/

-

-static void print(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-}

-

-static void println(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-  chSequentialStreamWrite(&SD1, (uint8_t *)"\r\n", 2);

-}

-

-static void printn(uint32_t n) {

-  char buf[16], *p;

-

-  if (!n)

-    chSequentialStreamPut(&SD1, '0');

-  else {

-    p = buf;

-    while (n)

-      *p++ = (n % 10) + '0', n /= 10;

-    while (p > buf)

-      chSequentialStreamPut(&SD1, *--p);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-  gptcnt_t interval, threshold, worst;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

-

-  /*

-   * Initializes the mailboxes and creates the worker threads.

-   */

-  for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

-    chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

-                      NORMALPRIO - 20, WorkerThread, (void *)i);

-  }

-

-  /*

-   * Test procedure.

-   */

-  println("");

-  println("*** ChibiOS/RT IRQ-STORM long duration test");

-  println("***");

-  print("*** Kernel:       ");

-  println(CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

-#endif

-  print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

-#endif

-#ifdef CH_PORT_INFO

-  print("*** Port Info:    ");

-  println(CH_PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  print("*** Platform:     ");

-  println(PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  print("*** Test Board:   ");

-  println(BOARD_NAME);

-#endif

-  println("***");

-  print("*** System Clock: ");

-  printn(LPC13xx_SYSCLK);

-  println("");

-  print("*** Iterations:   ");

-  printn(ITERATIONS);

-  println("");

-  print("*** Randomize:    ");

-  printn(RANDOMIZE);

-  println("");

-  print("*** Threads:      ");

-  printn(NUM_THREADS);

-  println("");

-  print("*** Mailbox size: ");

-  printn(MAILBOX_SIZE);

-  println("");

-

-  println("");

-  worst = 0;

-  for (i = 1; i <= ITERATIONS; i++){

-    print("Iteration ");

-    printn(i);

-    println("");

-    saturated = FALSE;

-    threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

-      chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

-      if (!saturated)

-        print(".");

-      else {

-        print("#");

-        if (threshold == 0)

-          threshold = interval;

-      }

-    }

-    /* Gives the worker threads a chance to empty the mailboxes before next

-       cycle.*/

-    chThdSleepMilliseconds(20);

-    println("");

-    print("Saturated at ");

-    printn(threshold);

-    println(" uS");

-    println("");

-    if (threshold > worst)

-      worst = threshold;

-  }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

-

-  print("Worst case at ");

-  printn(worst);

-  println(" uS");

-  println("");

-  println("Test Complete");

-

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-  }

-  return 0;

-}

diff --git a/testhal/LPC13xx/IRQ_STORM/mcuconf.h b/testhal/LPC13xx/IRQ_STORM/mcuconf.h
deleted file mode 100644
index 98da38735..000000000
--- a/testhal/LPC13xx/IRQ_STORM/mcuconf.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * LPC13xx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- *

- * IRQ priorities:

- * 7...0        Lowest...highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define LPC13xx_PLLCLK_SOURCE               SYSPLLCLKSEL_SYSOSC

-#define LPC13xx_SYSPLL_MUL                  6

-#define LPC13xx_SYSPLL_DIV                  4

-#define LPC13xx_MAINCLK_SOURCE              SYSMAINCLKSEL_PLLOUT

-#define LPC13xx_SYSABHCLK_DIV               1

-

-/*

- * ADC driver system settings.

- */

-

-/*

- * CAN driver system settings.

- */

-

-/*

- * GPT driver system settings.

- */

-#define LPC13xx_GPT_USE_CT16B0              TRUE

-#define LPC13xx_GPT_USE_CT16B1              TRUE

-#define LPC13xx_GPT_USE_CT32B0              TRUE

-#define LPC13xx_GPT_USE_CT32B1              TRUE

-#define LPC13xx_GPT_CT16B0_IRQ_PRIORITY     2

-#define LPC13xx_GPT_CT16B1_IRQ_PRIORITY     6

-#define LPC13xx_GPT_CT32B0_IRQ_PRIORITY     2

-#define LPC13xx_GPT_CT32B1_IRQ_PRIORITY     2

-

-/*

- * PWM driver system settings.

- */

-

-/*

- * SERIAL driver system settings.

- */

-#define LPC13xx_SERIAL_USE_UART0            TRUE

-#define LPC13xx_SERIAL_FIFO_PRELOAD         16

-#define LPC13xx_SERIAL_UART0CLKDIV          1

-#define LPC13xx_SERIAL_UART0_IRQ_PRIORITY   3

-

-/*

- * SPI driver system settings.

- */

-#define LPC13xx_SPI_USE_SSP0                TRUE

-#define LPC13xx_SPI_SSP0CLKDIV              1

-#define LPC13xx_SPI_SSP0_IRQ_PRIORITY       5

-#define LPC13xx_SPI_SSP_ERROR_HOOK(spip)    chSysHalt()

-#define LPC13xx_SPI_SCK0_SELECTOR           SCK0_IS_PIO2_11

diff --git a/testhal/LPC13xx/IRQ_STORM/readme.txt b/testhal/LPC13xx/IRQ_STORM/readme.txt
deleted file mode 100644
index 85a4cee82..000000000
--- a/testhal/LPC13xx/IRQ_STORM/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - IRQ-STORM demo for LPC13xx.                            **

-*****************************************************************************

-

-** TARGET **

-

-The demo will on an LPCXpresso LPC1114 board.

-

-** The Demo **

-

-The application demonstrates the use of the LPC13xx GPT, PAL and Serial drivers

-in order to implement a system stress demo.

-

-** Build Procedure **

-

-The demo has been tested using the free LPCXpresso toolchain but also with

-Codesourcery and YAGARTO.

-Just modify the TRGT line in the makefile in order to use different GCC ports.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-NXP and are licensed under a different license.

-

-                             http://www.nxp.com

diff --git a/testhal/LPC17xx/CAN/Makefile b/testhal/LPC17xx/CAN/Makefile
deleted file mode 100644
index f991dd1ce..000000000
--- a/testhal/LPC17xx/CAN/Makefile
+++ /dev/null
@@ -1,195 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/CAN/halconf.h b/testhal/LPC17xx/CAN/halconf.h
deleted file mode 100644
index 6a4fb655e..000000000
--- a/testhal/LPC17xx/CAN/halconf.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 TRUE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 FALSE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#define DAC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define DAC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/CAN/main.c b/testhal/LPC17xx/CAN/main.c
deleted file mode 100644
index 163fb6616..000000000
--- a/testhal/LPC17xx/CAN/main.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND1, GPIO0_LED2_RED};

-static const struct can_instance can2 = {&CAND2, GPIO0_LED3_EXT}; /* Connect LED to board. */

-

-#if LPC17xx_CAN_USE_FILTER

-static const CANFilterExt cfe_id_table[2] = {

-  CANFilterExtEntry(0, 0x0ABCDEF0),

-  CANFilterExtEntry(1, 0x01234567)

-

-};

-

-static const CANFilterConfig canfcfg = {

- 0,

- NULL,

- 0,

- NULL,

- 0,

- NULL,

- 0,

- cfe_id_table,

- 2,

- NULL,

- 0

-};

-#endif

-

-/*

- * Operating mode

- */

-static const CANConfig cancfg = {

-  0,

-  CANBTR_SJW(0) | CANBTR_TESG2(1) |

-  CANBTR_TESG1(8) | CANBTR_BRP(20)

-};

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx1_wa, 256);

-static WORKING_AREA(can_rx2_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(GPIO0, cip->led);

-    }

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg_can1;

-  CANTxFrame txmsg_can2;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg_can1.IDE = CAN_IDE_EXT;

-  txmsg_can1.EID = 0x01234567;

-  txmsg_can1.RTR = CAN_RTR_DATA;

-  txmsg_can1.DLC = 8;

-  txmsg_can1.data32[0] = 0x55AA55AA;

-  txmsg_can1.data32[1] = 0x00FF00FF;

-

-  txmsg_can2.IDE = CAN_IDE_EXT;

-  txmsg_can2.EID = 0x0ABCDEF0;

-  txmsg_can2.RTR = CAN_RTR_DATA;

-  txmsg_can2.DLC = 8;

-  txmsg_can2.data32[0] = 0x66AA66AA;

-  txmsg_can2.data32[1] = 0x44FF44FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg_can1, MS2ST(100));

-    canTransmit(&CAND2, CAN_ANY_MAILBOX, &txmsg_can2, MS2ST(100));

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN drivers 1 and 2.

-   */

-  canStart(&CAND1, &cancfg);

-  canStart(&CAND2, &cancfg);

-

-#if LPC17xx_CAN_USE_FILTER

-  canSetFilter(&canfcfg);

-#endif

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx1_wa, sizeof(can_rx1_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_rx2_wa, sizeof(can_rx2_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can2);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/LPC17xx/CAN/mcuconf.h b/testhal/LPC17xx/CAN/mcuconf.h
deleted file mode 100644
index 904e6b449..000000000
--- a/testhal/LPC17xx/CAN/mcuconf.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL                  4
-#define LPC17xx_USBPLL_DIV                  4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV                  4
-#define LPC17xx_CLKOUT_SELECT               CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                TRUE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
-/*
- * CAN driver system settings.
- */
-#define LPC17xx_CAN_USE_CAN1                TRUE
-#define LPC17xx_CAN_USE_CAN2                TRUE
-#define LPC17xx_CAN_IRQ_PRIORITY            11
-#define LPC17xx_CAN_USE_LOCAL_SELF_TEST     FALSE
-#define LPC17xx_CAN_USE_FILTER              TRUE
diff --git a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/Makefile b/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/Makefile
deleted file mode 100644
index f991dd1ce..000000000
--- a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/Makefile
+++ /dev/null
@@ -1,195 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/chconf.h b/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/halconf.h b/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/halconf.h
deleted file mode 100644
index 6a4fb655e..000000000
--- a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/halconf.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 TRUE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 FALSE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#define DAC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define DAC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/main.c b/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/main.c
deleted file mode 100644
index ec6322946..000000000
--- a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/main.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Local self test mode.

- */

-static const CANConfig cancfg = {

-  CANMOD_STM,

-  CANBTR_SJW(0) | CANBTR_TESG2(1) |

-  CANBTR_TESG1(8) | CANBTR_BRP(20)

-};

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx1_wa, 256);

-static msg_t can_rx(void *p) {

-

-  EventListener el;

-  CANRxFrame rxmsg;

-

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&CAND1.rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-    while (canReceive(&CAND1, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(GPIO0, GPIO0_LED2_RED);

-    }

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.DLC = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN drivers 1.

-   */

-  canStart(&CAND1, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx1_wa, sizeof(can_rx1_wa), NORMALPRIO + 7,

-                    can_rx, NULL);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/mcuconf.h b/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/mcuconf.h
deleted file mode 100644
index 991013b5e..000000000
--- a/testhal/LPC17xx/CAN_LOCAL_SELF_TEST/mcuconf.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL                  4
-#define LPC17xx_USBPLL_DIV                  4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV                  4
-#define LPC17xx_CLKOUT_SELECT               CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                TRUE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
-/*
- * CAN driver system settings.
- */
-#define LPC17xx_CAN_USE_CAN1                TRUE
-#define LPC17xx_CAN_USE_CAN2                FALSE
-#define LPC17xx_CAN_IRQ_PRIORITY            11
-#define LPC17xx_CAN_USE_LOCAL_SELF_TEST     TRUE
-#define LPC17XX_CAN_USE_FILTER              FALSE
diff --git a/testhal/LPC17xx/DAC/Makefile b/testhal/LPC17xx/DAC/Makefile
deleted file mode 100644
index 8a7273417..000000000
--- a/testhal/LPC17xx/DAC/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/DAC/halconf.h b/testhal/LPC17xx/DAC/halconf.h
deleted file mode 100644
index 6ad145842..000000000
--- a/testhal/LPC17xx/DAC/halconf.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 TRUE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 TRUE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 TRUE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 TRUE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 TRUE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#define DAC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define DAC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/DAC/main.c b/testhal/LPC17xx/DAC/main.c
deleted file mode 100644
index 624d52c8f..000000000
--- a/testhal/LPC17xx/DAC/main.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#define NSAMPLES    255

-

-const uint32_t sine_wave[NSAMPLES] = {

- 512 << 6,  524 << 6,  537 << 6,  549 << 6,  562 << 6,  574 << 6,  587 << 6,  599 << 6,  612 << 6,  624 << 6,

- 636 << 6,  649 << 6,  661 << 6,  673 << 6,  685 << 6,  696 << 6,  708 << 6,  720 << 6,  731 << 6,  743 << 6,

- 754 << 6,  765 << 6,  776 << 6,  786 << 6,  797 << 6,  807 << 6,  818 << 6,  828 << 6,  837 << 6,  847 << 6,

- 856 << 6,  866 << 6,  875 << 6,  883 << 6,  892 << 6,  900 << 6,  908 << 6,  916 << 6,  924 << 6,  931 << 6,

- 938 << 6,  945 << 6,  952 << 6,  958 << 6,  964 << 6,  970 << 6,  975 << 6,  981 << 6,  985 << 6,  990 << 6,

- 994 << 6,  998 << 6, 1002 << 6, 1006 << 6, 1009 << 6, 1012 << 6, 1014 << 6, 1016 << 6, 1018 << 6, 1020 << 6,

-1021 << 6, 1022 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1022 << 6, 1021 << 6, 1019 << 6,

-1017 << 6, 1015 << 6, 1013 << 6, 1010 << 6, 1007 << 6, 1004 << 6, 1000 << 6,  996 << 6,  992 << 6,  988 << 6,

- 983 << 6,  978 << 6,  973 << 6,  967 << 6,  961 << 6,  955 << 6,  948 << 6,  942 << 6,  935 << 6,  928 << 6,

- 920 << 6,  912 << 6,  904 << 6,  896 << 6,  888 << 6,  879 << 6,  870 << 6,  861 << 6,  852 << 6,  842 << 6,

- 832 << 6,  823 << 6,  812 << 6,  802 << 6,  792 << 6,  781 << 6,  770 << 6,  759 << 6,  748 << 6,  737 << 6,

- 725 << 6,  714 << 6,  702 << 6,  691 << 6,  679 << 6,  667 << 6,  655 << 6,  642 << 6,  630 << 6,  618 << 6,

- 606 << 6,  593 << 6,  581 << 6,  568 << 6,  556 << 6,  543 << 6,  530 << 6,  518 << 6,  505 << 6,  493 << 6,

- 480 << 6,  467 << 6,  455 << 6,  442 << 6,  430 << 6,  417 << 6,  405 << 6,  393 << 6,  381 << 6,  368 << 6,

- 356 << 6,  344 << 6,  332 << 6,  321 << 6,  309 << 6,  298 << 6,  286 << 6,  275 << 6,  264 << 6,  253 << 6,

- 242 << 6,  231 << 6,  221 << 6,  211 << 6,  200 << 6,  191 << 6,  181 << 6,  171 << 6,  162 << 6,  153 << 6,

- 144 << 6,  135 << 6,  127 << 6,  119 << 6,  111 << 6,  103 << 6,   95 << 6,   88 << 6,   81 << 6,   75 << 6,

-  68 << 6,   62 << 6,   56 << 6,   50 << 6,   45 << 6,   40 << 6,   35 << 6,   31 << 6,   27 << 6,   23 << 6,

-  19 << 6,   16 << 6,   13 << 6,   10 << 6,    8 << 6,    6 << 6,    4 << 6,    2 << 6,    1 << 6,    0 << 6,

-   0 << 6,    0 << 6,    0 << 6,    0 << 6,    1 << 6,    2 << 6,    3 << 6,    5 << 6,    7 << 6,    9 << 6,

-  11 << 6,   14 << 6,   17 << 6,   21 << 6,   25 << 6,   29 << 6,   33 << 6,   38 << 6,   42 << 6,   48 << 6,

-  53 << 6,   59 << 6,   65 << 6,   71 << 6,   78 << 6,   85 << 6,   92 << 6,   99 << 6,  107 << 6,  115 << 6,

- 123 << 6,  131 << 6,  140 << 6,  148 << 6,  157 << 6,  167 << 6,  176 << 6,  186 << 6,  195 << 6,  205 << 6,

- 216 << 6,  226 << 6,  237 << 6,  247 << 6,  258 << 6,  269 << 6,  280 << 6,  292 << 6,  303 << 6,  315 << 6,

- 327 << 6,  338 << 6,  350 << 6,  362 << 6,  374 << 6,  387 << 6,  399 << 6,  411 << 6,  424 << 6,  436 << 6,

- 449 << 6,  461 << 6,  474 << 6,  486 << 6,  499 << 6};

-

-/*

- * Red LEDs blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palTogglePad(GPIO0, GPIO0_LED2_RED);

-    chThdSleepMilliseconds(500);

-  }

-}

-

-/*

- * DAC conversion groups, with callbacks.

- */

-static const DACConversionGroup dacconvgrp1 = {

-  1, /* Channels */

-  NULL, /* End of transfer callback */

-  NULL, /* Error callback */

-  true /*circular mode */

-};

-

-/*

- * DAC config

- */

-static const DACConfig daccfg1 = {

-  1000*NSAMPLES, /* Multiply the buffer size to the desired frequency in Hz */

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Starting the DAC driver.

-   */

-  dacStart(&DACD1, &daccfg1);

-

-  /*

-   * Sending the dac_buffer

-   */

-  dacStartConversion(&DACD1, &dacconvgrp1, sine_wave, NSAMPLES);

-

-  while (TRUE) {

-

-  chThdSleepMilliseconds(1000);

-

-  }

-}

diff --git a/testhal/LPC17xx/DAC/mcuconf.h b/testhal/LPC17xx/DAC/mcuconf.h
deleted file mode 100644
index 756c89823..000000000
--- a/testhal/LPC17xx/DAC/mcuconf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL                  4
-#define LPC17xx_USBPLL_DIV                  4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV                  4
-#define LPC17xx_CLKOUT_SELECT               CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                TRUE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
diff --git a/testhal/LPC17xx/DMA_MEM/Makefile b/testhal/LPC17xx/DMA_MEM/Makefile
deleted file mode 100644
index bd1283e2d..000000000
--- a/testhal/LPC17xx/DMA_MEM/Makefile
+++ /dev/null
@@ -1,198 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       $(CHIBIOS)/os/various/chprintf.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/DMA_MEM/chconf.h b/testhal/LPC17xx/DMA_MEM/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC17xx/DMA_MEM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/DMA_MEM/halconf.h b/testhal/LPC17xx/DMA_MEM/halconf.h
deleted file mode 100644
index 6404031cb..000000000
--- a/testhal/LPC17xx/DMA_MEM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/DMA_MEM/main.c b/testhal/LPC17xx/DMA_MEM/main.c
deleted file mode 100644
index 8c50302da..000000000
--- a/testhal/LPC17xx/DMA_MEM/main.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

-

-#define MEM_SIZE    50

-

-BaseSequentialStream  * chp = (BaseSequentialStream  *)&SD1;

-

-uint32_t mem_src[MEM_SIZE];

-uint32_t mem_dst[MEM_SIZE];

-

-static void dma_mem_callback(void * dummy, uint32_t flags) {

-  (void)dummy;

-  (void)flags;

-}

-

-/*

- * Red LEDs blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palTogglePad(GPIO0, GPIO0_LED2_RED);

-    chThdSleepMilliseconds(500);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  uint32_t i;

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Activates the SD driver 1.

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-

-  chprintf(chp, "Data before dma transfer.\r\n");

-  chprintf(chp, "source \t destination\r\n");

-  for (i = 0; i < MEM_SIZE; i++) {

-     mem_src[i] = i;

-     mem_dst[i] = 0;

-     chprintf(chp, "%x \t %x\r\n", mem_src[i], mem_dst[i]);

-  }

-

-  dmaChannelAllocate(DMA_CHANNEL0, &dma_mem_callback, NULL);

-  dmaChannelSrcAddr(DMA_CHANNEL0, &mem_src[0]);

-  dmaChannelDstAddr(DMA_CHANNEL0, &mem_dst[0]);

-  dmaChannelControl(DMA_CHANNEL0, DMA_CTRL_TRANSFER_SIZE(MEM_SIZE)  |

-                                  DMA_CTRL_SRC_BSIZE_16             |

-                                  DMA_CTRL_DST_BSIZE_16             |

-                                  DMA_CTRL_SRC_WIDTH_WORD           |

-                                  DMA_CTRL_DST_WIDTH_WORD           |

-                                  DMA_CTRL_SRC_INC                  |

-                                  DMA_CTRL_DST_INC                  |

-                                  DMA_CTRL_INT);

-

-  dmaChannelConfig(DMA_CHANNEL0,  DMA_CFG_CH_ENABLE   |

-                                  DMA_CFG_TTYPE_M2M   |

-                                  DMA_CFG_IE          |

-                                  DMA_CFG_ITC);

-

-  chThdSleepMilliseconds(5000);

-  chprintf(chp, "Data after dma transfer.\r\n");

-  chprintf(chp, "source \t destination\r\n");

-  for (i = 0; i < MEM_SIZE; i++) {

-    chprintf(chp, "%x \t %x\r\n", mem_src[i], mem_dst[i]);

-  }

-

-  for (i = 0; i < MEM_SIZE; i++)

-    if (mem_src[i] != mem_dst[i])

-      break;

-

-  if (i == MEM_SIZE)

-    chprintf(chp, "Data transfer ok.\r\n");

-  else

-    chprintf(chp, "Error.\r\n");

-

-  while (TRUE) {

-

-  chThdSleepMilliseconds(1000);

-

-  }

-}

diff --git a/testhal/LPC17xx/DMA_MEM/mcuconf.h b/testhal/LPC17xx/DMA_MEM/mcuconf.h
deleted file mode 100644
index 83e32c7ee..000000000
--- a/testhal/LPC17xx/DMA_MEM/mcuconf.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL                  4
-#define LPC17xx_USBPLL_DIV                  4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV                  4
-#define LPC17xx_CLKOUT_SELECT               CLKOUTSEL_CCLK
-#define LPC17xx_DMA_REQUIRED
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                TRUE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
diff --git a/testhal/LPC17xx/I2C/Makefile b/testhal/LPC17xx/I2C/Makefile
deleted file mode 100644
index 1ce88af46..000000000
--- a/testhal/LPC17xx/I2C/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       $(CHIBIOS)/os/various/shell.c \
-       $(CHIBIOS)/os/various/chprintf.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/I2C/chconf.h b/testhal/LPC17xx/I2C/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC17xx/I2C/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/I2C/halconf.h b/testhal/LPC17xx/I2C/halconf.h
deleted file mode 100644
index 3af5958e8..000000000
--- a/testhal/LPC17xx/I2C/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 TRUE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/I2C/main.c b/testhal/LPC17xx/I2C/main.c
deleted file mode 100644
index 6a9d35268..000000000
--- a/testhal/LPC17xx/I2C/main.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

-

-BaseSequentialStream  * chp = (BaseSequentialStream  *)&SD1;

-

-/* buffers depth */

-#define EEPROM_RX_DEPTH 10

-#define EEPROM_TX_DEPTH 12

-

-#define EEPROM_WR_ADRESS_H  0x00

-#define EEPROM_WR_ADRESS_L  0x00

-

-#define EEPROM_RD_ADRESS_H  0x00

-#define EEPROM_RD_ADRESS_L  0x00

-

-static uint8_t rxbuf[EEPROM_RX_DEPTH];

-static uint8_t txbuf[EEPROM_TX_DEPTH];

-

-static i2cflags_t errors = 0;

-#define EEPROM_24LC64_ADDR 0b1010000

-

-

-/* I2C interface #2 */

-static const I2CConfig i2ccfg2 = {

-    I2C_FAST_MODE,

-    400000

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-  msg_t status = RDY_OK;

-  systime_t tmo = MS2ST(4);

-  uint8_t i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Starts I2C

-   */

-  i2cStart(&I2CD2, &i2ccfg2);

-

-  /*

-   * Prepares the Serial driver 1

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-

-  txbuf[0] = EEPROM_WR_ADRESS_H; /* register address */

-  txbuf[1] = EEPROM_WR_ADRESS_L;

-  for (i = 2; i < EEPROM_TX_DEPTH; i++)

-    txbuf[i] = i - 2;

-

-  i2cAcquireBus(&I2CD2);

-  status = i2cMasterTransmitTimeout(&I2CD2, EEPROM_24LC64_ADDR, txbuf, EEPROM_TX_DEPTH, rxbuf, 0, tmo);

-  i2cReleaseBus(&I2CD2);

-

-  if (status != RDY_OK){

-    errors = i2cGetErrors(&I2CD2);

-    chprintf(chp, "EEPROM write error code: %d\n\r", errors);

-  }

-  else {

-    chprintf(chp, "\n\rEEPROM write:\t");

-    for (i = 2; i < EEPROM_TX_DEPTH; i++) {

-      chprintf(chp, "0x%02x ", txbuf[i]);

-    }

-  }

-

-  chThdSleepMilliseconds(5);

-

-  /* Read */

-  txbuf[0] = EEPROM_RD_ADRESS_H; /* register address */

-  txbuf[1] = EEPROM_RD_ADRESS_L;

-  i2cAcquireBus(&I2CD2);

-  status = i2cMasterTransmitTimeout(&I2CD2, EEPROM_24LC64_ADDR, txbuf, 2, rxbuf, EEPROM_RX_DEPTH, tmo);

-  i2cReleaseBus(&I2CD2);

-

-  if (status != RDY_OK) {

-      errors = i2cGetErrors(&I2CD2);

-      chprintf(chp, "EEPROM read error code: %d\n\r", errors);

-   }

-

-  chprintf(chp, "\n\rEEPROM read:\t ");

-  for (i = 0; i < EEPROM_RX_DEPTH; i++) {

-    chprintf(chp, "0x%02x ", rxbuf[i]);

-  }

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    palTogglePad(GPIO0, GPIO0_LED2_RED);

-    chThdSleepMilliseconds(100);

-  }

-}

-

-

-

diff --git a/testhal/LPC17xx/I2C/mcuconf.h b/testhal/LPC17xx/I2C/mcuconf.h
deleted file mode 100644
index 756c89823..000000000
--- a/testhal/LPC17xx/I2C/mcuconf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL                  4
-#define LPC17xx_USBPLL_DIV                  4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV                  4
-#define LPC17xx_CLKOUT_SELECT               CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                TRUE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
diff --git a/testhal/LPC17xx/IRQ_STORM/Makefile b/testhal/LPC17xx/IRQ_STORM/Makefile
deleted file mode 100644
index 8a7273417..000000000
--- a/testhal/LPC17xx/IRQ_STORM/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1769.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/IRQ_STORM/chconf.h b/testhal/LPC17xx/IRQ_STORM/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC17xx/IRQ_STORM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/IRQ_STORM/halconf.h b/testhal/LPC17xx/IRQ_STORM/halconf.h
deleted file mode 100644
index 6404031cb..000000000
--- a/testhal/LPC17xx/IRQ_STORM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/IRQ_STORM/main.c b/testhal/LPC17xx/IRQ_STORM/main.c
deleted file mode 100644
index 833ccde71..000000000
--- a/testhal/LPC17xx/IRQ_STORM/main.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-/*===========================================================================*/

-/* Configurable settings.                                                    */

-/*===========================================================================*/

-

-#ifndef RANDOMIZE

-#define RANDOMIZE       FALSE

-#endif

-

-#ifndef ITERATIONS

-#define ITERATIONS      100

-#endif

-

-#ifndef NUM_THREADS

-#define NUM_THREADS     4

-#endif

-

-#ifndef MAILBOX_SIZE

-#define MAILBOX_SIZE    4

-#endif

-

-/*===========================================================================*/

-/* Test related code.                                                        */

-/*===========================================================================*/

-

-#define MSG_SEND_LEFT   0

-#define MSG_SEND_RIGHT  1

-

-static bool_t saturated;

-

-/*

- * Mailboxes and buffers.

- */

-static Mailbox mb[NUM_THREADS];

-static msg_t b[NUM_THREADS][MAILBOX_SIZE];

-

-/*

- * Test worker threads.

- */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

-static msg_t WorkerThread(void *arg) {

-  static volatile unsigned x = 0;

-  static unsigned cnt = 0;

-  unsigned me = (unsigned)arg;

-  unsigned target;

-  unsigned r;

-  msg_t msg;

-

-  chRegSetThreadName("worker");

-

-  /* Work loop.*/

-  while (TRUE) {

-    /* Waiting for a message.*/

-   chMBFetch(&mb[me], &msg, TIME_INFINITE);

-

-#if RANDOMIZE

-   /* Pseudo-random delay.*/

-   {

-     chSysLock();

-     r = rand() & 15;

-     chSysUnlock();

-     while (r--)

-       x++;

-   }

-#else

-   /* Fixed delay.*/

-   {

-     r = me >> 4;

-     while (r--)

-       x++;

-   }

-#endif

-

-    /* Deciding in which direction to re-send the message.*/

-    if (msg == MSG_SEND_LEFT)

-      target = me - 1;

-    else

-      target = me + 1;

-

-    if (target < NUM_THREADS) {

-      /* If this thread is not at the end of a chain re-sending the message,

-         note this check works because the variable target is unsigned.*/

-      msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

-        saturated = TRUE;

-    }

-    else {

-      /* Provides a visual feedback about the system.*/

-      if (++cnt >= 500) {

-        cnt = 0;

-        palTogglePad(GPIO0, GPIO0_LED2_RED);

-      }

-    }

-  }

-}

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt1cb    /* Timer callback.*/

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt2cb    /* Timer callback.*/

-};

-

-

-/*===========================================================================*/

-/* Generic demo code.                                                        */

-/*===========================================================================*/

-

-static void print(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-}

-

-static void println(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD1, *p++);

-  }

-  chSequentialStreamWrite(&SD1, (uint8_t *)"\r\n", 2);

-}

-

-static void printn(uint32_t n) {

-  char buf[16], *p;

-

-  if (!n)

-    chSequentialStreamPut(&SD1, '0');

-  else {

-    p = buf;

-    while (n)

-      *p++ = (n % 10) + '0', n /= 10;

-    while (p > buf)

-      chSequentialStreamPut(&SD1, *--p);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-  gptcnt_t interval, threshold, worst;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

-   */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

-

-  /*

-   * Initializes the mailboxes and creates the worker threads.

-   */

-  for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

-    chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

-                      NORMALPRIO - 20, WorkerThread, (void *)i);

-  }

-

-  /*

-   * Test procedure.

-   */

-  println("");

-  println("*** ChibiOS/RT IRQ-STORM long duration test");

-  println("***");

-  print("*** Kernel:       ");

-  println(CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

-#endif

-  print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

-#endif

-#ifdef CH_PORT_INFO

-  print("*** Port Info:    ");

-  println(CH_PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  print("*** Platform:     ");

-  println(PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  print("*** Test Board:   ");

-  println(BOARD_NAME);

-#endif

-  println("***");

-  print("*** System Clock: ");

-  printn(LPC17xx_CCLK);

-  println("");

-  print("*** Iterations:   ");

-  printn(ITERATIONS);

-  println("");

-  print("*** Randomize:    ");

-  printn(RANDOMIZE);

-  println("");

-  print("*** Threads:      ");

-  printn(NUM_THREADS);

-  println("");

-  print("*** Mailbox size: ");

-  printn(MAILBOX_SIZE);

-  println("");

-

-  println("");

-  worst = 0;

-  for (i = 1; i <= ITERATIONS; i++){

-    print("Iteration ");

-    printn(i);

-    println("");

-    saturated = FALSE;

-    threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

-      chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

-      if (!saturated)

-        print(".");

-      else {

-        print("#");

-        if (threshold == 0)

-          threshold = interval;

-      }

-    }

-    /* Gives the worker threads a chance to empty the mailboxes before next

-       cycle.*/

-    chThdSleepMilliseconds(20);

-    println("");

-    print("Saturated at ");

-    printn(threshold);

-    println(" uS");

-    println("");

-    if (threshold > worst)

-      worst = threshold;

-  }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

-

-  print("Worst case at ");

-  printn(worst);

-  println(" uS");

-  println("");

-  println("Test Complete");

-

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-  }

-  return 0;

-}

diff --git a/testhal/LPC17xx/IRQ_STORM/mcuconf.h b/testhal/LPC17xx/IRQ_STORM/mcuconf.h
deleted file mode 100644
index 54d00bb99..000000000
--- a/testhal/LPC17xx/IRQ_STORM/mcuconf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL             		4
-#define LPC17xx_USBPLL_DIV          		4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV      			4
-#define LPC17xx_CLKOUT_SELECT      			CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                FALSE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
diff --git a/testhal/LPC17xx/RTC/Makefile b/testhal/LPC17xx/RTC/Makefile
deleted file mode 100644
index 71a2a8a8e..000000000
--- a/testhal/LPC17xx/RTC/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/EA_LPCXPRESSO_LPC1769/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC17xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC17xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC1766.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       $(CHIBIOS)/os/various/shell.c \
-       $(CHIBIOS)/os/various/chprintf.c \
-       $(CHIBIOS)/os/various/chrtclib.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m3
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC17XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC17xx/RTC/chconf.h b/testhal/LPC17xx/RTC/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC17xx/RTC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/RTC/halconf.h b/testhal/LPC17xx/RTC/halconf.h
deleted file mode 100644
index 1788f9e08..000000000
--- a/testhal/LPC17xx/RTC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 TRUE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC17xx/RTC/main.c b/testhal/LPC17xx/RTC/main.c
deleted file mode 100644
index da8d7e18e..000000000
--- a/testhal/LPC17xx/RTC/main.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

-This structure is used to hold the values representing a calendar time.

-It contains the following members, with the meanings as shown.

-

-int tm_sec       seconds after minute [0-61] (61 allows for 2 leap-seconds)

-int tm_min       minutes after hour [0-59]

-int tm_hour      hours after midnight [0-23]

-int tm_mday      day of the month [1-31]

-int tm_mon       month of year [0-11]

-int tm_year      current year-1900

-int tm_wday      days since Sunday [0-6]

-int tm_yday      days since January 1st [0-365]

-int tm_isdst     daylight savings indicator (1 = yes, 0 = no, -1 = unknown)

-*/

-

-#include <string.h>

-#include <stdlib.h>

-#include <time.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "shell.h"

-#include "chprintf.h"

-#include "chrtclib.h"

-

-static RTCAlarm alarmspec;

-static time_t unix_time;

-

-/* libc stub */

-int _getpid(void) {return 1;}

-/* libc stub */

-void _exit(int i) {(void)i;}

-/* libc stub */

-#include <errno.h>

-#undef errno

-extern int errno;

-int _kill(int pid, int sig) {

-  (void)pid;

-  (void)sig;

-  errno = EINVAL;

-  return -1;

-}

-

-

-/* sleep indicator thread */

-static WORKING_AREA(blinkWA, 128);

-static msg_t blink_thd(void *arg){

-  (void)arg;

-  while (TRUE) {

-    chThdSleepMilliseconds(100);

-    palTogglePad(GPIO0, GPIO0_LED2_RED);

-  }

-  return 0;

-}

-

-static void wakeup_cb(RTCDriver *rtcp, rtcevent_t event) {

-

-  (void)rtcp;

-

-  if (event == RTC_EVENT_ALARM) {

-

-  }

-}

-

-/* Wake-up from Deep-sleep mode with rtc alarm (must be set first) */

-/* Before going sleep disconnect debugger !!! User manual page 758 */

-static void func_sleep(void) {

-

-  /* Deep sleep-mode configuration */

-  LPC_SC->PCON &= ~((1UL << 1) | (1UL << 0));       /* Clear PM0 and PM1 bit for deep sleep mode.*/

-  SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;                /* Deep sleep mode */

-

-  __WFI();

-

-  NVIC_SystemReset();

-}

-

-/* Wake-up from Deep power-down with wake-up pin or rtc alarm (must be set first) */

-/* Before going power down disconnect debugger !!! User manual page 758 */

-static void func_pwrdown(void) {

-

-  LPC_SC->PCON |= (1UL << 1) | (1UL << 0);          /* Set PM0 and PM1 bit for deep power-down mode.*/

-  SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;                /* Deep sleep mode. */

-

-  __WFI();

-}

-

-static void cmd_pwrdown(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-

-  if (argc > 0) {

-    chprintf(chp, "Usage: pwrdown\r\n");

-    return;

-  }

-  chprintf(chp, "Going to power down.\r\n");

-

-  chThdSleepMilliseconds(200);

-

-  func_pwrdown();

-

-}

-

-static void cmd_sleep(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-  if (argc > 0) {

-    chprintf(chp, "Usage: sleep\r\n");

-    return;

-  }

-  chprintf(chp, "Going to sleep.\r\n");

-

-  chThdSleepMilliseconds(200);

-

-  /* going to anabiosis */

-  func_sleep();

-}

-

-/*

- *

- */

-static void cmd_alarm(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-  struct tm timp;

-

-  if (argc < 1) {

-    goto ERROR;

-  }

-

-  if ((argc == 1) && (strcmp(argv[0], "get") == 0)){

-    rtcGetAlarm(&RTCD1, 0, &alarmspec);

-    timp.tm_sec = alarmspec.alsec;

-    timp.tm_min = alarmspec.almin;

-    timp.tm_hour = alarmspec.alhour;

-    timp.tm_mday = alarmspec.aldom;

-    timp.tm_mon = alarmspec.almonth - 1;

-    timp.tm_wday = alarmspec.aldow;

-    timp.tm_year = alarmspec.alyear - 1900;

-    timp.tm_yday = alarmspec.aldoy - 1;

-    chprintf(chp, "%D%s",mktime(&timp)," - alarm in seconds\r\n");

-    return;

-  }

-

-  if ((argc == 2) && (strcmp(argv[0], "set") == 0)){

-    unix_time = (uint32_t)atol(argv[1]);

-    localtime_r(&unix_time, &timp);

-    alarmspec.alsec = timp.tm_sec;

-    alarmspec.almin = timp.tm_min;

-    alarmspec.alhour = timp.tm_hour;

-    alarmspec.aldom = timp.tm_mday;

-    alarmspec.almonth = timp.tm_mon + 1;

-    alarmspec.aldow = timp.tm_wday;

-    alarmspec.alyear = timp.tm_year + 1900;

-    alarmspec.aldoy = timp.tm_yday + 1;

-    rtcSetAlarm(&RTCD1, 0, &alarmspec);

-    rtcSetCallback(&RTCD1, wakeup_cb);

-    return;

-  }

-  else{

-    goto ERROR;

-  }

-

-ERROR:

-  chprintf(chp, "Usage: alarm get\r\n");

-  chprintf(chp, "       alarm set N\r\n");

-  chprintf(chp, "where N is alarm time in seconds\r\n");

-}

-

-/*

- *

- */

-static void cmd_date(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argv;

-  struct tm timp;

-

-  if (argc == 0) {

-    goto ERROR;

-  }

-

-  if ((argc == 1) && (strcmp(argv[0], "get") == 0)){

-    unix_time = rtcGetTimeUnixSec(&RTCD1);

-

-    if (unix_time == -1){

-      chprintf(chp, "incorrect time in RTC cell\r\n");

-    }

-    else{

-      chprintf(chp, "%D%s",unix_time," - unix time\r\n");

-      rtcGetTimeTm(&RTCD1, &timp);

-      chprintf(chp, "%s%s",asctime(&timp)," - formatted time string\r\n");

-    }

-    return;

-  }

-

-  if ((argc == 2) && (strcmp(argv[0], "set") == 0)){

-    unix_time = atol(argv[1]);

-    if (unix_time > 0){

-      rtcSetTimeUnixSec(&RTCD1, unix_time);

-      return;

-    }

-    else{

-      goto ERROR;

-    }

-  }

-  else{

-    goto ERROR;

-  }

-

-ERROR:

-  chprintf(chp, "Usage: date get\r\n");

-  chprintf(chp, "       date set N\r\n");

-  chprintf(chp, "where N is time in seconds sins Unix epoch\r\n");

-  chprintf(chp, "you can get current N value from unix console by the command\r\n");

-  chprintf(chp, "%s", "date +\%s\r\n");

-  return;

-}

-

-static const ShellCommand commands[] = {

-  {"alarm", cmd_alarm},

-  {"date",  cmd_date},

-  {"sleep", cmd_sleep},

-  {"pwrdown", cmd_pwrdown},

-  {NULL, NULL}

-};

-

-static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream  *)&SD1,

-  commands

-};

-

-BaseSequentialStream  * chp1 = (BaseSequentialStream  *)&SD1;

-

-/**

- * Main function.

- */

-int main(void){

-

-  halInit();

-  chSysInit();

-  chThdCreateStatic(blinkWA, sizeof(blinkWA), NORMALPRIO, blink_thd, NULL);

-

-  sdStart(&SD1, NULL);        /* Default is 38400-8-N-1.*/

-

-  if (LPC_SC->PCON & (1UL << 11)) {

-    chprintf(chp1, "Woke from Deep power-down\r\n");

-    LPC_SC->PCON |= (1UL << 11);

-  }

-

-  if (LPC_SC->PCON & (1UL << 9)) {

-    chprintf(chp1, "Woke from Deep-sleep mode\r\n");

-    LPC_SC->PCON |= (1UL << 9);

-  }

-

-  /* Shell initialization.*/

-  shellInit();

-  static WORKING_AREA(waShell, 1024);

-  shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO);

-

-  /* wait until user do not want to test wakeup */

-  while (TRUE){

-    chThdSleepMilliseconds(200);

-  }

-  return 0;

-}

-

-

diff --git a/testhal/LPC17xx/RTC/mcuconf.h b/testhal/LPC17xx/RTC/mcuconf.h
deleted file mode 100644
index 54d00bb99..000000000
--- a/testhal/LPC17xx/RTC/mcuconf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC17xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC17xx_MAINOSC_ENABLE              TRUE
-#define LPC17xx_SYSCLK_SELECT               CLKSRCSEL_MAINOSC
-#define LPC17xx_MAINPLL_ENABLE              TRUE
-#define LPC17xx_MAINPLL_MUL                 30
-#define LPC17xx_MAINPLL_PREDIV              1
-#define LPC17xx_USBPLL_ENABLE               FALSE
-#define LPC17xx_USBPLL_MUL             		4
-#define LPC17xx_USBPLL_DIV          		4
-#define LPC17xx_CCLK_DIV                    3
-#define LPC17xx_PCLK_SELECT                 PCLKSEL_CCLK
-#define LPC17xx_CLKOUT_ENABLE               FALSE
-#define LPC17xx_CLKOUT_DIV      			4
-#define LPC17xx_CLKOUT_SELECT      			CLKOUTSEL_CCLK
-
-/*
- * GPT driver system settings.
- */
-#define LPC17xx_GPT_USE_TIM0                TRUE
-#define LPC17xx_GPT_USE_TIM1                TRUE
-#define LPC17xx_GPT_USE_TIM2                TRUE
-#define LPC17xx_GPT_USE_TIM3                TRUE
-#define LPC17xx_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC17xx_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC17xx_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC17xx_SERIAL_USE_UART0            TRUE
-#define LPC17xx_SERIAL_USE_UART1            FALSE
-#define LPC17xx_SERIAL_USE_UART2            FALSE
-#define LPC17xx_SERIAL_USE_UART3            FALSE
-#define LPC17xx_SERIAL_FIFO_PRELOAD         16
-#define LPC17xx_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC17xx_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC17xx_I2C_USE_I2C0                FALSE
-#define LPC17xx_I2C_USE_I2C1                FALSE
-#define LPC17xx_I2C_USE_I2C2                FALSE
-#define LPC17xx_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C1_IRQ_PRIORITY       3
-#define LPC17xx_I2C_I2C2_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC17xx_SPI_USE_SSP0                FALSE
-#define LPC17xx_SPI_USE_SSP1                FALSE
-#define LPC17xx_SPI_SSP0CLKDIV              1
-#define LPC17xx_SPI_SSP1CLKDIV              1
-#define LPC17xx_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC17xx_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC17xx_RTC_IS_CALENDAR             TRUE
-#define LPC17xx_RTC_USE_ALARM               TRUE
-#define LPC17xx_RTC_IRQ_PRIORITY            3
-
diff --git a/testhal/LPC43xx/DAC/Makefile b/testhal/LPC43xx/DAC/Makefile
deleted file mode 100644
index b0f735621..000000000
--- a/testhal/LPC43xx/DAC/Makefile
+++ /dev/null
@@ -1,233 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-# Enables the use of FPU on Cortex-M4.
-ifeq ($(USE_FPU),)
-  USE_FPU = no
-endif
-
-# Enables the use of Cortex-M4 by LPC43xx in LPC43xx.h.
-ifeq ($(USE_CORE_M4),)
-  USE_CORE_M4 = yes
-endif
-
-# LPC43xx boot select: ram, spifi_flash_debug, flash.
-ifeq ($(LPC_BOOT_SELECT),)
-  LPC_BOOT_SELECT = ram
-endif
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/NONSTANDARD_LPC4330_SBC/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC43xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC43xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC4330_RAM_DEBUG.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m4
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-ifeq ($(USE_FPU),yes)
-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-  DDEFS += -DCORTEX_USE_FPU=TRUE
-else
-  DDEFS += -DCORTEX_USE_FPU=FALSE
-endif
-
-ifeq ($(USE_CORE_M4),yes)
-  DDEFS +=  -DCORE_M4
-endif
-
-ifeq ($(LPC_BOOT_SELECT), ram)
-  DDEFS += -DCORTEX_VTOR_INIT=0x10000000
-else
-ifeq ($(LPC_BOOT_SELECT), spifi_flash_debug)
-  DDEFS += -DCORTEX_VTOR_INIT=0x14000000
-else
-  DDEFS += -DCORTEX_VTOR_INIT=0x00000000
-endif	
-endif
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC43xx/DAC/chconf.h b/testhal/LPC43xx/DAC/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC43xx/DAC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC43xx/DAC/halconf.h b/testhal/LPC43xx/DAC/halconf.h
deleted file mode 100644
index 273973da0..000000000
--- a/testhal/LPC43xx/DAC/halconf.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 TRUE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 FALSE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                 TRUE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#define DAC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define DAC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC43xx/DAC/main.c b/testhal/LPC43xx/DAC/main.c
deleted file mode 100644
index 3f4b8309a..000000000
--- a/testhal/LPC43xx/DAC/main.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#define NSAMPLES    255

-

-const uint32_t sine_wave[NSAMPLES] = {

- 512 << 6,  524 << 6,  537 << 6,  549 << 6,  562 << 6,  574 << 6,  587 << 6,  599 << 6,  612 << 6,  624 << 6,

- 636 << 6,  649 << 6,  661 << 6,  673 << 6,  685 << 6,  696 << 6,  708 << 6,  720 << 6,  731 << 6,  743 << 6,

- 754 << 6,  765 << 6,  776 << 6,  786 << 6,  797 << 6,  807 << 6,  818 << 6,  828 << 6,  837 << 6,  847 << 6,

- 856 << 6,  866 << 6,  875 << 6,  883 << 6,  892 << 6,  900 << 6,  908 << 6,  916 << 6,  924 << 6,  931 << 6,

- 938 << 6,  945 << 6,  952 << 6,  958 << 6,  964 << 6,  970 << 6,  975 << 6,  981 << 6,  985 << 6,  990 << 6,

- 994 << 6,  998 << 6, 1002 << 6, 1006 << 6, 1009 << 6, 1012 << 6, 1014 << 6, 1016 << 6, 1018 << 6, 1020 << 6,

-1021 << 6, 1022 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1023 << 6, 1022 << 6, 1021 << 6, 1019 << 6,

-1017 << 6, 1015 << 6, 1013 << 6, 1010 << 6, 1007 << 6, 1004 << 6, 1000 << 6,  996 << 6,  992 << 6,  988 << 6,

- 983 << 6,  978 << 6,  973 << 6,  967 << 6,  961 << 6,  955 << 6,  948 << 6,  942 << 6,  935 << 6,  928 << 6,

- 920 << 6,  912 << 6,  904 << 6,  896 << 6,  888 << 6,  879 << 6,  870 << 6,  861 << 6,  852 << 6,  842 << 6,

- 832 << 6,  823 << 6,  812 << 6,  802 << 6,  792 << 6,  781 << 6,  770 << 6,  759 << 6,  748 << 6,  737 << 6,

- 725 << 6,  714 << 6,  702 << 6,  691 << 6,  679 << 6,  667 << 6,  655 << 6,  642 << 6,  630 << 6,  618 << 6,

- 606 << 6,  593 << 6,  581 << 6,  568 << 6,  556 << 6,  543 << 6,  530 << 6,  518 << 6,  505 << 6,  493 << 6,

- 480 << 6,  467 << 6,  455 << 6,  442 << 6,  430 << 6,  417 << 6,  405 << 6,  393 << 6,  381 << 6,  368 << 6,

- 356 << 6,  344 << 6,  332 << 6,  321 << 6,  309 << 6,  298 << 6,  286 << 6,  275 << 6,  264 << 6,  253 << 6,

- 242 << 6,  231 << 6,  221 << 6,  211 << 6,  200 << 6,  191 << 6,  181 << 6,  171 << 6,  162 << 6,  153 << 6,

- 144 << 6,  135 << 6,  127 << 6,  119 << 6,  111 << 6,  103 << 6,   95 << 6,   88 << 6,   81 << 6,   75 << 6,

-  68 << 6,   62 << 6,   56 << 6,   50 << 6,   45 << 6,   40 << 6,   35 << 6,   31 << 6,   27 << 6,   23 << 6,

-  19 << 6,   16 << 6,   13 << 6,   10 << 6,    8 << 6,    6 << 6,    4 << 6,    2 << 6,    1 << 6,    0 << 6,

-   0 << 6,    0 << 6,    0 << 6,    0 << 6,    1 << 6,    2 << 6,    3 << 6,    5 << 6,    7 << 6,    9 << 6,

-  11 << 6,   14 << 6,   17 << 6,   21 << 6,   25 << 6,   29 << 6,   33 << 6,   38 << 6,   42 << 6,   48 << 6,

-  53 << 6,   59 << 6,   65 << 6,   71 << 6,   78 << 6,   85 << 6,   92 << 6,   99 << 6,  107 << 6,  115 << 6,

- 123 << 6,  131 << 6,  140 << 6,  148 << 6,  157 << 6,  167 << 6,  176 << 6,  186 << 6,  195 << 6,  205 << 6,

- 216 << 6,  226 << 6,  237 << 6,  247 << 6,  258 << 6,  269 << 6,  280 << 6,  292 << 6,  303 << 6,  315 << 6,

- 327 << 6,  338 << 6,  350 << 6,  362 << 6,  374 << 6,  387 << 6,  399 << 6,  411 << 6,  424 << 6,  436 << 6,

- 449 << 6,  461 << 6,  474 << 6,  486 << 6,  499 << 6};

-

-/*

- * Red LEDs blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palTogglePad(GPIO2, GPIO2_LED);

-    chThdSleepMilliseconds(500);

-  }

-}

-

-/*

- * DAC conversion groups, with callbacks.

- */

-static const DACConversionGroup dacconvgrp1 = {

-  1, /* Channels */

-  NULL, /* End of transfer callback */

-  NULL, /* Error callback */

-  true /*circular mode */

-};

-

-/*

- * DAC config

- */

-static const DACConfig daccfg1 = {

-  1000*NSAMPLES, /* Multiply the buffer size to the desired frequency in Hz */

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Starting the DAC driver.

-   */

-  dacStart(&DACD1, &daccfg1);

-

-  /*

-   * Sending the dac_buffer

-   */

-  dacStartConversion(&DACD1, &dacconvgrp1, sine_wave, NSAMPLES);

-

-  while (TRUE) {

-

-  chThdSleepMilliseconds(1000);

-

-  }

-}

diff --git a/testhal/LPC43xx/DAC/mcuconf.h b/testhal/LPC43xx/DAC/mcuconf.h
deleted file mode 100644
index 70b21a649..000000000
--- a/testhal/LPC43xx/DAC/mcuconf.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC43xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- *
- * LPC base clock sources:
- *  0x00 32 kHz oscillator
- *  0x01 IRC (default)
- *  0x02 ENET_RX_CLK
- *  0x03 ENET_TX_CLK
- *  0x04 GP_CLKIN
- *  0x06 Crystal oscillator
- *  0x07 PLL0USB
- *  0x08 PLL0AUDIO
- *  0x09 PLL1
- *  0x0C IDIVA
- *  0x0D IDIVB
- *  0x0E IDIVC
- *  0x0F IDIVD
- *  0x10 IDIVE
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC_XTAL_ENABLE                 TRUE
-#define LPC_PLL1_ENABLE                 TRUE
-#define LPC_PLL1_MUL                    17
-#define LPC_PLL1_PREDIV                 1
-#define LPC_PLL1_POSTDIV_ENABLE         FALSE
-#define LPC_PLL1_POSTDIV                2
-#define LPC_PLL0USB_ENABLE              FALSE
-#define LPC_PLL0AUDIO_ENABLE            FALSE
-#define LPC_FLASHLESS                   TRUE
-
-/* Clock dividers */
-#define LPC_IDIVA_ENABLE                FALSE
-#define LPC_IDIVA_DIV                   1
-#define LPC_IDIVA_SRC                   0x09
-#define LPC_IDIVB_ENABLE                FALSE
-#define LPC_IDIVB_DIV                   2
-#define LPC_IDIVB_SRC                   0x09
-#define LPC_IDIVC_ENABLE                FALSE
-#define LPC_IDIVC_DIV                   3
-#define LPC_IDIVC_SRC                   0x09
-#define LPC_IDIVD_ENABLE                FALSE
-#define LPC_IDIVD_DIV                   1
-#define LPC_IDIVD_SRC                   0x09
-#define LPC_IDIVE_ENABLE                FALSE
-#define LPC_IDIVE_DIV                   1
-#define LPC_IDIVE_SRC                   0x09
-
-/* Base clocks */
-#define LPC_BASE_USB0_CLK_ENABLE        FALSE   /* Base clock for USB0. */
-#define LPC_BASE_PERIPH_CLK_ENABLE      TRUE    /* Base clock for Cortex-M0SUB subsystem, SGPIO. */
-#define LPC_BASE_PERIPH_CLK_SRC         0x09
-#define LPC_BASE_USB1_CLK_ENABLE        TRUE    /* Base clock for USB1. */
-#define LPC_BASE_USB1_CLK_SRC           0x01
-#define LPC_BASE_SPIFI_CLK_ENABLE       FALSE   /* Base clock for SPIFI. */
-#define LPC_BASE_SPIFI_CLK_SRC          0x0D
-#define LPC_BASE_SPI_CLK_ENABLE         TRUE    /* Base clock for SPI. */
-#define LPC_BASE_SPI_CLK_SRC            0x01
-#define LPC_BASE_PHY_RX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Receive clock. */
-#define LPC_BASE_PHY_RX_CLK_SRC         0x0E
-#define LPC_BASE_PHY_TX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Transmit clock. */
-#define LPC_BASE_PHY_TX_CLK_SRC         0x0E
-#define LPC_BASE_APB1_CLK_ENABLE        TRUE    /* Base clock for APB1: I2C0, I2S, CAN1. */
-#define LPC_BASE_APB1_CLK_SRC           0x01
-#define LPC_BASE_APB3_CLK_ENABLE        TRUE    /* Base clock for APB3: I2C1, DAC, ADC0, ADC1, CAN0. */
-#define LPC_BASE_APB3_CLK_SRC           0x09
-#define LPC_BASE_LCD_CLK_ENABLE         FALSE   /* Base clock for LCD. */
-#define LPC_BASE_LCD_CLK_SRC            0x01
-#define LPC_BASE_SDIO_CLK_ENABLE        FALSE   /* Base clock for SD/MMC. */
-#define LPC_BASE_SDIO_CLK_SRC           0x01
-#define LPC_BASE_SSP0_CLK_ENABLE        TRUE    /* Base clock for SSP0. */
-#define LPC_BASE_SSP0_CLK_SRC           0x01
-#define LPC_BASE_SSP1_CLK_ENABLE        TRUE    /* Base clock for SSP1. */
-#define LPC_BASE_SSP1_CLK_SRC           0x01
-#define LPC_BASE_UART0_CLK_ENABLE       TRUE    /* Base clock for UART0. */
-#define LPC_BASE_UART0_CLK_SRC          0x01
-#define LPC_BASE_UART1_CLK_ENABLE       TRUE    /* Base clock for UART1. */
-#define LPC_BASE_UART1_CLK_SRC          0x01
-#define LPC_BASE_UART2_CLK_ENABLE       TRUE    /* Base clock for UART2. */
-#define LPC_BASE_UART2_CLK_SRC          0x01
-#define LPC_BASE_UART3_CLK_ENABLE       TRUE    /* Base clock for UART3. */
-#define LPC_BASE_UART3_CLK_SRC          0x01
-#define LPC_BASE_OUT_CLK_ENABLE         FALSE   /* Base clock for UART0. */
-#define LPC_BASE_OUT_CLK_SRC            0x01
-#define LPC_BASE_APLL_CLK_ENABLE        FALSE   /* Base clock for audio system.  */
-#define LPC_BASE_APLL_CLK_SRC           0x01
-#define LPC_BASE_CGU_OUT0_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT0 clock output. */
-#define LPC_BASE_CGU_OUT0_CLK_SRC       0x01
-#define LPC_BASE_CGU_OUT1_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT1 clock output. */
-#define LPC_BASE_CGU_OUT1_CLK_SRC       0x01
-
-/*
- * GPT driver system settings.
- */
-#define LPC_GPT_USE_TIM0                FALSE
-#define LPC_GPT_USE_TIM1                FALSE
-#define LPC_GPT_USE_TIM2                FALSE
-#define LPC_GPT_USE_TIM3                FALSE
-#define LPC_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC_GPT_TIM1_IRQ_PRIORITY       2
-#define LPC_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC_SERIAL_USE_UART0            FALSE
-#define LPC_SERIAL_USE_UART1            FALSE
-#define LPC_SERIAL_USE_UART2            FALSE
-#define LPC_SERIAL_USE_UART3            TRUE
-#define LPC_SERIAL_FIFO_PRELOAD         16
-#define LPC_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC_I2C_USE_I2C0                FALSE
-#define LPC_I2C_USE_I2C1                FALSE
-#define LPC_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC_I2C_I2C1_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC_SPI_USE_SSP0                FALSE
-#define LPC_SPI_USE_SSP1                FALSE
-#define LPC_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * DAC driver system settings.
- */
-#define LPC_DAC_DMA_CHANNEL             DMA_CHANNEL5
diff --git a/testhal/LPC43xx/DMA_MEM/Makefile b/testhal/LPC43xx/DMA_MEM/Makefile
deleted file mode 100644
index 4919842b5..000000000
--- a/testhal/LPC43xx/DMA_MEM/Makefile
+++ /dev/null
@@ -1,234 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-# Enables the use of FPU on Cortex-M4.
-ifeq ($(USE_FPU),)
-  USE_FPU = no
-endif
-
-# Enables the use of Cortex-M4 by LPC43xx in LPC43xx.h.
-ifeq ($(USE_CORE_M4),)
-  USE_CORE_M4 = yes
-endif
-
-# LPC43xx boot select: ram, spifi_flash_debug, flash.
-ifeq ($(LPC_BOOT_SELECT),)
-  LPC_BOOT_SELECT = ram
-endif
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/NONSTANDARD_LPC4330_SBC/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC43xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC43xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC4330_RAM_DEBUG.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       $(CHIBIOS)/os/various/chprintf.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m4
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DLPC43XX -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-ifeq ($(USE_FPU),yes)
-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-  DDEFS += -DCORTEX_USE_FPU=TRUE
-else
-  DDEFS += -DCORTEX_USE_FPU=FALSE
-endif
-
-ifeq ($(USE_CORE_M4),yes)
-  DDEFS +=  -DCORE_M4
-endif
-
-ifeq ($(LPC_BOOT_SELECT), ram)
-  DDEFS += -DCORTEX_VTOR_INIT=0x10000000
-else
-ifeq ($(LPC_BOOT_SELECT), spifi_flash_debug)
-  DDEFS += -DCORTEX_VTOR_INIT=0x14000000
-else
-  DDEFS += -DCORTEX_VTOR_INIT=0x00000000
-endif	
-endif
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC43xx/DMA_MEM/chconf.h b/testhal/LPC43xx/DMA_MEM/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC43xx/DMA_MEM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC43xx/DMA_MEM/main.c b/testhal/LPC43xx/DMA_MEM/main.c
deleted file mode 100644
index 39dbb7e2b..000000000
--- a/testhal/LPC43xx/DMA_MEM/main.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "chprintf.h"

-

-#define MEM_SIZE    50

-

-BaseSequentialStream  * chp = (BaseSequentialStream  *)&SD4;

-

-uint32_t mem_src[MEM_SIZE];

-uint32_t mem_dst[MEM_SIZE];

-

-static void dma_mem_callback(void * dummy, uint32_t flags) {

-  (void)dummy;

-  (void)flags;

-}

-

-/*

- * Red LEDs blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palTogglePad(GPIO2, GPIO2_LED);

-    chThdSleepMilliseconds(500);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  uint32_t i;

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Activates the SD driver 1.

-   */

-  sdStart(&SD4, NULL);          /* Default is 38400-8-N-1.*/

-

-  chprintf(chp, "Data before dma transfer.\r\n");

-  chprintf(chp, "source \t destination\r\n");

-  for (i = 0; i < MEM_SIZE; i++) {

-     mem_src[i] = i;

-     mem_dst[i] = 0;

-     chprintf(chp, "%x \t %x\r\n", mem_src[i], mem_dst[i]);

-  }

-

-  dmaChannelAllocate(DMA_CHANNEL0, &dma_mem_callback, NULL);

-  dmaChannelSrcAddr(DMA_CHANNEL0, &mem_src[0]);

-  dmaChannelDstAddr(DMA_CHANNEL0, &mem_dst[0]);

-  dmaChannelControl(DMA_CHANNEL0, DMA_CTRL_TRANSFER_SIZE(MEM_SIZE)  |

-                                  DMA_CTRL_SRC_BSIZE_16             |

-                                  DMA_CTRL_DST_BSIZE_16             |

-                                  DMA_CTRL_SRC_WIDTH_WORD           |

-                                  DMA_CTRL_DST_WIDTH_WORD           |

-                                  DMA_CTRL_SRC_AHBM0                |

-                                  DMA_CTRL_DST_AHBM0                |

-                                  DMA_CTRL_SRC_INC                  |

-                                  DMA_CTRL_DST_INC                  |

-                                  DMA_CTRL_INT);

-

-  dmaChannelConfig(DMA_CHANNEL0,  DMA_CFG_CH_ENABLE   |

-                                  DMA_CFG_FCTRL_M2M   |

-                                  DMA_CFG_IE          |

-                                  DMA_CFG_ITC);

-

-  chThdSleepMilliseconds(5000);

-  chprintf(chp, "Data after dma transfer.\r\n");

-  chprintf(chp, "source \t destination\r\n");

-  for (i = 0; i < MEM_SIZE; i++) {

-    chprintf(chp, "%x \t %x\r\n", mem_src[i], mem_dst[i]);

-  }

-

-  for (i = 0; i < MEM_SIZE; i++)

-    if (mem_src[i] != mem_dst[i])

-      break;

-

-  if (i == MEM_SIZE)

-    chprintf(chp, "Data transfer ok.\r\n");

-  else

-    chprintf(chp, "Error.\r\n");

-

-  while (TRUE) {

-

-  chThdSleepMilliseconds(1000);

-

-  }

-}

diff --git a/testhal/LPC43xx/DMA_MEM/mcuconf.h b/testhal/LPC43xx/DMA_MEM/mcuconf.h
deleted file mode 100644
index d92d8b722..000000000
--- a/testhal/LPC43xx/DMA_MEM/mcuconf.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC43xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- *
-  * LPC base clock sources:
- *  0x00 32 kHz oscillator
- *  0x01 IRC (default)
- *  0x02 ENET_RX_CLK
- *  0x03 ENET_TX_CLK
- *  0x04 GP_CLKIN
- *  0x06 Crystal oscillator
- *  0x07 PLL0USB
- *  0x08 PLL0AUDIO
- *  0x09 PLL1
- *  0x0C IDIVA
- *  0x0D IDIVB
- *  0x0E IDIVC
- *  0x0F IDIVD
- *  0x10 IDIVE
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC_XTAL_ENABLE                 TRUE
-#define LPC_PLL1_ENABLE                 TRUE
-#define LPC_PLL1_MUL                    17
-#define LPC_PLL1_PREDIV                 1
-#define LPC_PLL1_POSTDIV_ENABLE         FALSE
-#define LPC_PLL1_POSTDIV                2
-#define LPC_PLL0USB_ENABLE              FALSE
-#define LPC_PLL0AUDIO_ENABLE            FALSE
-#define LPC_FLASHLESS                   TRUE
-
-/* Clock dividers */
-#define LPC_IDIVA_ENABLE                FALSE
-#define LPC_IDIVA_DIV                   1
-#define LPC_IDIVA_SRC                   0x09
-#define LPC_IDIVB_ENABLE                FALSE
-#define LPC_IDIVB_DIV                   2
-#define LPC_IDIVB_SRC                   0x09
-#define LPC_IDIVC_ENABLE                FALSE
-#define LPC_IDIVC_DIV                   3
-#define LPC_IDIVC_SRC                   0x09
-#define LPC_IDIVD_ENABLE                FALSE
-#define LPC_IDIVD_DIV                   1
-#define LPC_IDIVD_SRC                   0x09
-#define LPC_IDIVE_ENABLE                FALSE
-#define LPC_IDIVE_DIV                   1
-#define LPC_IDIVE_SRC                   0x09
-
-/* Base clocks */
-#define LPC_BASE_USB0_CLK_ENABLE        FALSE   /* Base clock for USB0. */
-#define LPC_BASE_PERIPH_CLK_ENABLE      TRUE    /* Base clock for Cortex-M0SUB subsystem, SGPIO. */
-#define LPC_BASE_PERIPH_CLK_SRC         0x09
-#define LPC_BASE_USB1_CLK_ENABLE        TRUE    /* Base clock for USB1. */
-#define LPC_BASE_USB1_CLK_SRC           0x01
-#define LPC_BASE_SPIFI_CLK_ENABLE       FALSE   /* Base clock for SPIFI. */
-#define LPC_BASE_SPIFI_CLK_SRC          0x0D
-#define LPC_BASE_SPI_CLK_ENABLE         TRUE    /* Base clock for SPI. */
-#define LPC_BASE_SPI_CLK_SRC            0x01
-#define LPC_BASE_PHY_RX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Receive clock. */
-#define LPC_BASE_PHY_RX_CLK_SRC         0x0E
-#define LPC_BASE_PHY_TX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Transmit clock. */
-#define LPC_BASE_PHY_TX_CLK_SRC         0x0E
-#define LPC_BASE_APB1_CLK_ENABLE        TRUE    /* Base clock for APB1: I2C0, I2S, CAN1. */
-#define LPC_BASE_APB1_CLK_SRC           0x01
-#define LPC_BASE_APB3_CLK_ENABLE        TRUE    /* Base clock for APB3: I2C1, DAC, ADC0, ADC1, CAN0. */
-#define LPC_BASE_APB3_CLK_SRC           0x09
-#define LPC_BASE_LCD_CLK_ENABLE         FALSE   /* Base clock for LCD. */
-#define LPC_BASE_LCD_CLK_SRC            0x01
-#define LPC_BASE_SDIO_CLK_ENABLE        FALSE   /* Base clock for SD/MMC. */
-#define LPC_BASE_SDIO_CLK_SRC           0x01
-#define LPC_BASE_SSP0_CLK_ENABLE        TRUE    /* Base clock for SSP0. */
-#define LPC_BASE_SSP0_CLK_SRC           0x01
-#define LPC_BASE_SSP1_CLK_ENABLE        TRUE    /* Base clock for SSP1. */
-#define LPC_BASE_SSP1_CLK_SRC           0x01
-#define LPC_BASE_UART0_CLK_ENABLE       TRUE    /* Base clock for UART0. */
-#define LPC_BASE_UART0_CLK_SRC          0x01
-#define LPC_BASE_UART1_CLK_ENABLE       TRUE    /* Base clock for UART1. */
-#define LPC_BASE_UART1_CLK_SRC          0x01
-#define LPC_BASE_UART2_CLK_ENABLE       TRUE    /* Base clock for UART2. */
-#define LPC_BASE_UART2_CLK_SRC          0x01
-#define LPC_BASE_UART3_CLK_ENABLE       TRUE    /* Base clock for UART3. */
-#define LPC_BASE_UART3_CLK_SRC          0x01
-#define LPC_BASE_OUT_CLK_ENABLE         FALSE   /* Base clock for UART0. */
-#define LPC_BASE_OUT_CLK_SRC            0x01
-#define LPC_BASE_APLL_CLK_ENABLE        FALSE   /* Base clock for audio system.  */
-#define LPC_BASE_APLL_CLK_SRC           0x01
-#define LPC_BASE_CGU_OUT0_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT0 clock output. */
-#define LPC_BASE_CGU_OUT0_CLK_SRC       0x01
-#define LPC_BASE_CGU_OUT1_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT1 clock output. */
-#define LPC_BASE_CGU_OUT1_CLK_SRC       0x01
-
-#define LPC_DMA_REQUIRED
-
-/*
- * GPT driver system settings.
- */
-#define LPC_GPT_USE_TIM0                FALSE
-#define LPC_GPT_USE_TIM1                FALSE
-#define LPC_GPT_USE_TIM2                FALSE
-#define LPC_GPT_USE_TIM3                FALSE
-#define LPC_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC_GPT_TIM1_IRQ_PRIORITY       6
-#define LPC_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC_SERIAL_USE_UART0            FALSE
-#define LPC_SERIAL_USE_UART1            FALSE
-#define LPC_SERIAL_USE_UART2            FALSE
-#define LPC_SERIAL_USE_UART3            TRUE
-#define LPC_SERIAL_FIFO_PRELOAD         16
-#define LPC_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC_I2C_USE_I2C0                FALSE
-#define LPC_I2C_USE_I2C1                FALSE
-#define LPC_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC_I2C_I2C1_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC_SPI_USE_SSP0                FALSE
-#define LPC_SPI_USE_SSP1                FALSE
-#define LPC_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC_SPI_SSP1_IRQ_PRIORITY       5
diff --git a/testhal/LPC43xx/IRQ_STORM/Makefile b/testhal/LPC43xx/IRQ_STORM/Makefile
deleted file mode 100644
index b0f735621..000000000
--- a/testhal/LPC43xx/IRQ_STORM/Makefile
+++ /dev/null
@@ -1,233 +0,0 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-# Enables the use of FPU on Cortex-M4.
-ifeq ($(USE_FPU),)
-  USE_FPU = no
-endif
-
-# Enables the use of Cortex-M4 by LPC43xx in LPC43xx.h.
-ifeq ($(USE_CORE_M4),)
-  USE_CORE_M4 = yes
-endif
-
-# LPC43xx boot select: ram, spifi_flash_debug, flash.
-ifeq ($(LPC_BOOT_SELECT),)
-  LPC_BOOT_SELECT = ram
-endif
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files
-CHIBIOS = ../../..
-include $(CHIBIOS)/boards/NONSTANDARD_LPC4330_SBC/board.mk
-include $(CHIBIOS)/os/hal/platforms/LPC43xx/platform.mk
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/LPC43xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
-include $(CHIBIOS)/test/test.mk
-
-# Define linker script file here
-LDSCRIPT= $(PORTLD)/LPC4330_RAM_DEBUG.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(PORTSRC) \
-       $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CHIBIOS)/os/various/syscalls.c \
-       main.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC = $(PORTASM)
-
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m4
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-OD   = $(TRGT)objdump
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of default section
-#
-
-# List all default C defines here, like -D_DEBUG=1
-DDEFS = -D__NEWLIB__
-
-# List all default ASM defines here, like -D_DEBUG=1
-DADEFS =
-
-# List all default directories to look for include files here
-DINCDIR =
-
-# List the default directory to look for the libraries here
-DLIBDIR =
-
-# List all default libraries here
-DLIBS =
-
-#
-# End of default section
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-ifeq ($(USE_FPU),yes)
-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-  DDEFS += -DCORTEX_USE_FPU=TRUE
-else
-  DDEFS += -DCORTEX_USE_FPU=FALSE
-endif
-
-ifeq ($(USE_CORE_M4),yes)
-  DDEFS +=  -DCORE_M4
-endif
-
-ifeq ($(LPC_BOOT_SELECT), ram)
-  DDEFS += -DCORTEX_VTOR_INIT=0x10000000
-else
-ifeq ($(LPC_BOOT_SELECT), spifi_flash_debug)
-  DDEFS += -DCORTEX_VTOR_INIT=0x14000000
-else
-  DDEFS += -DCORTEX_VTOR_INIT=0x00000000
-endif	
-endif
-
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/LPC43xx/IRQ_STORM/chconf.h b/testhal/LPC43xx/IRQ_STORM/chconf.h
deleted file mode 100644
index f4682cb9d..000000000
--- a/testhal/LPC43xx/IRQ_STORM/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC43xx/IRQ_STORM/halconf.h b/testhal/LPC43xx/IRQ_STORM/halconf.h
deleted file mode 100644
index 6404031cb..000000000
--- a/testhal/LPC43xx/IRQ_STORM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 TRUE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
diff --git a/testhal/LPC43xx/IRQ_STORM/main.c b/testhal/LPC43xx/IRQ_STORM/main.c
deleted file mode 100644
index f8662eb28..000000000
--- a/testhal/LPC43xx/IRQ_STORM/main.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-/*===========================================================================*/

-/* Configurable settings.                                                    */

-/*===========================================================================*/

-

-#ifndef RANDOMIZE

-#define RANDOMIZE       FALSE

-#endif

-

-#ifndef ITERATIONS

-#define ITERATIONS      100

-#endif

-

-#ifndef NUM_THREADS

-#define NUM_THREADS     4

-#endif

-

-#ifndef MAILBOX_SIZE

-#define MAILBOX_SIZE    4

-#endif

-

-/*===========================================================================*/

-/* Test related code.                                                        */

-/*===========================================================================*/

-

-#define MSG_SEND_LEFT   0

-#define MSG_SEND_RIGHT  1

-

-static bool_t saturated;

-

-/*

- * Mailboxes and buffers.

- */

-static Mailbox mb[NUM_THREADS];

-static msg_t b[NUM_THREADS][MAILBOX_SIZE];

-

-/*

- * Test worker threads.

- */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

-static msg_t WorkerThread(void *arg) {

-  static volatile unsigned x = 0;

-  static unsigned cnt = 0;

-  unsigned me = (unsigned)arg;

-  unsigned target;

-  unsigned r;

-  msg_t msg;

-

-  chRegSetThreadName("worker");

-

-  /* Work loop.*/

-  while (TRUE) {

-    /* Waiting for a message.*/

-   chMBFetch(&mb[me], &msg, TIME_INFINITE);

-

-#if RANDOMIZE

-   /* Pseudo-random delay.*/

-   {

-     chSysLock();

-     r = rand() & 15;

-     chSysUnlock();

-     while (r--)

-       x++;

-   }

-#else

-   /* Fixed delay.*/

-   {

-     r = me >> 4;

-     while (r--)

-       x++;

-   }

-#endif

-

-    /* Deciding in which direction to re-send the message.*/

-    if (msg == MSG_SEND_LEFT)

-      target = me - 1;

-    else

-      target = me + 1;

-

-    if (target < NUM_THREADS) {

-      /* If this thread is not at the end of a chain re-sending the message,

-         note this check works because the variable target is unsigned.*/

-      msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

-        saturated = TRUE;

-    }

-    else {

-      /* Provides a visual feedback about the system.*/

-      if (++cnt >= 500) {

-        cnt = 0;

-        palTogglePad(GPIO2, GPIO2_LED);

-      }

-    }

-  }

-}

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-  msg_t msg;

-

-  (void)gptp;

-  chSysLockFromIsr();

-  msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

-    saturated = TRUE;

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt1cb    /* Timer callback.*/

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  1000000,  /* 1MHz timer clock.*/

-  gpt2cb    /* Timer callback.*/

-};

-

-

-/*===========================================================================*/

-/* Generic demo code.                                                        */

-/*===========================================================================*/

-

-static void print(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD4, *p++);

-  }

-}

-

-static void println(char *p) {

-

-  while (*p) {

-    chSequentialStreamPut(&SD4, *p++);

-  }

-  chSequentialStreamWrite(&SD4, (uint8_t *)"\r\n", 2);

-}

-

-static void printn(uint32_t n) {

-  char buf[16], *p;

-

-  if (!n)

-    chSequentialStreamPut(&SD4, '0');

-  else {

-    p = buf;

-    while (n)

-      *p++ = (n % 10) + '0', n /= 10;

-    while (p > buf)

-      chSequentialStreamPut(&SD4, *--p);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-  gptcnt_t interval, threshold, worst;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

-   */

-  sdStart(&SD4, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

-

-  /*

-   * Initializes the mailboxes and creates the worker threads.

-   */

-  for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

-    chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

-                      NORMALPRIO - 20, WorkerThread, (void *)i);

-  }

-

-  /*

-   * Test procedure.

-   */

-  println("");

-  println("*** ChibiOS/RT IRQ-STORM long duration test");

-  println("***");

-  print("*** Kernel:       ");

-  println(CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

-#endif

-  print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

-#endif

-#ifdef CH_PORT_INFO

-  print("*** Port Info:    ");

-  println(CH_PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  print("*** Platform:     ");

-  println(PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  print("*** Test Board:   ");

-  println(BOARD_NAME);

-#endif

-  println("***");

-  print("*** System Clock: ");

-  printn(LPC_BASE_M4_CLK);

-  println("");

-  print("*** Iterations:   ");

-  printn(ITERATIONS);

-  println("");

-  print("*** Randomize:    ");

-  printn(RANDOMIZE);

-  println("");

-  print("*** Threads:      ");

-  printn(NUM_THREADS);

-  println("");

-  print("*** Mailbox size: ");

-  printn(MAILBOX_SIZE);

-  println("");

-

-  println("");

-  worst = 0;

-  for (i = 1; i <= ITERATIONS; i++){

-    print("Iteration ");

-    printn(i);

-    println("");

-    saturated = FALSE;

-    threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

-      chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

-      if (!saturated)

-        print(".");

-      else {

-        print("#");

-        if (threshold == 0)

-          threshold = interval;

-      }

-    }

-    /* Gives the worker threads a chance to empty the mailboxes before next

-       cycle.*/

-    chThdSleepMilliseconds(20);

-    println("");

-    print("Saturated at ");

-    printn(threshold);

-    println(" uS");

-    println("");

-    if (threshold > worst)

-      worst = threshold;

-  }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

-

-  print("Worst case at ");

-  printn(worst);

-  println(" uS");

-  println("");

-  println("Test Complete");

-

-  /*

-   * Normal main() thread activity, nothing in this test.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(5000);

-  }

-  return 0;

-}

diff --git a/testhal/LPC43xx/IRQ_STORM/mcuconf.h b/testhal/LPC43xx/IRQ_STORM/mcuconf.h
deleted file mode 100644
index 956285eb3..000000000
--- a/testhal/LPC43xx/IRQ_STORM/mcuconf.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * LPC43xx drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 7...0        Lowest...highest.
- *
- * LPC base clock sources:
- *  0x00 32 kHz oscillator
- *  0x01 IRC (default)
- *  0x02 ENET_RX_CLK
- *  0x03 ENET_TX_CLK
- *  0x04 GP_CLKIN
- *  0x06 Crystal oscillator
- *  0x07 PLL0USB
- *  0x08 PLL0AUDIO
- *  0x09 PLL1
- *  0x0C IDIVA
- *  0x0D IDIVB
- *  0x0E IDIVC
- *  0x0F IDIVD
- *  0x10 IDIVE
- */
-
-/*
- * HAL driver system settings.
- */
-#define LPC_XTAL_ENABLE                 TRUE
-#define LPC_PLL1_ENABLE                 TRUE
-#define LPC_PLL1_MUL                    17
-#define LPC_PLL1_PREDIV                 1
-#define LPC_PLL1_POSTDIV_ENABLE         FALSE
-#define LPC_PLL1_POSTDIV                2
-#define LPC_PLL0USB_ENABLE              FALSE
-#define LPC_PLL0AUDIO_ENABLE            FALSE
-#define LPC_FLASHLESS                   TRUE
-
-/* Clock dividers */
-#define LPC_IDIVA_ENABLE                FALSE
-#define LPC_IDIVA_DIV                   1
-#define LPC_IDIVA_SRC                   0x09
-#define LPC_IDIVB_ENABLE                FALSE
-#define LPC_IDIVB_DIV                   2
-#define LPC_IDIVB_SRC                   0x09
-#define LPC_IDIVC_ENABLE                FALSE
-#define LPC_IDIVC_DIV                   3
-#define LPC_IDIVC_SRC                   0x09
-#define LPC_IDIVD_ENABLE                FALSE
-#define LPC_IDIVD_DIV                   1
-#define LPC_IDIVD_SRC                   0x09
-#define LPC_IDIVE_ENABLE                FALSE
-#define LPC_IDIVE_DIV                   1
-#define LPC_IDIVE_SRC                   0x09
-
-/* Base clocks */
-#define LPC_BASE_USB0_CLK_ENABLE        FALSE   /* Base clock for USB0. */
-#define LPC_BASE_PERIPH_CLK_ENABLE      TRUE    /* Base clock for Cortex-M0SUB subsystem, SGPIO. */
-#define LPC_BASE_PERIPH_CLK_SRC         0x09
-#define LPC_BASE_USB1_CLK_ENABLE        TRUE    /* Base clock for USB1. */
-#define LPC_BASE_USB1_CLK_SRC           0x01
-#define LPC_BASE_SPIFI_CLK_ENABLE       FALSE   /* Base clock for SPIFI. */
-#define LPC_BASE_SPIFI_CLK_SRC          0x0D
-#define LPC_BASE_SPI_CLK_ENABLE         TRUE    /* Base clock for SPI. */
-#define LPC_BASE_SPI_CLK_SRC            0x01
-#define LPC_BASE_PHY_RX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Receive clock. */
-#define LPC_BASE_PHY_RX_CLK_SRC         0x0E
-#define LPC_BASE_PHY_TX_CLK_ENABLE      FALSE   /* Base clock for Ethernet PHY Transmit clock. */
-#define LPC_BASE_PHY_TX_CLK_SRC         0x0E
-#define LPC_BASE_APB1_CLK_ENABLE        TRUE    /* Base clock for APB1: I2C0, I2S, CAN1. */
-#define LPC_BASE_APB1_CLK_SRC           0x01
-#define LPC_BASE_APB3_CLK_ENABLE        TRUE    /* Base clock for APB3: I2C1, DAC, ADC0, ADC1, CAN0. */
-#define LPC_BASE_APB3_CLK_SRC           0x09
-#define LPC_BASE_LCD_CLK_ENABLE         FALSE   /* Base clock for LCD. */
-#define LPC_BASE_LCD_CLK_SRC            0x01
-#define LPC_BASE_SDIO_CLK_ENABLE        FALSE   /* Base clock for SD/MMC. */
-#define LPC_BASE_SDIO_CLK_SRC           0x01
-#define LPC_BASE_SSP0_CLK_ENABLE        TRUE    /* Base clock for SSP0. */
-#define LPC_BASE_SSP0_CLK_SRC           0x01
-#define LPC_BASE_SSP1_CLK_ENABLE        TRUE    /* Base clock for SSP1. */
-#define LPC_BASE_SSP1_CLK_SRC           0x01
-#define LPC_BASE_UART0_CLK_ENABLE       TRUE    /* Base clock for UART0. */
-#define LPC_BASE_UART0_CLK_SRC          0x01
-#define LPC_BASE_UART1_CLK_ENABLE       TRUE    /* Base clock for UART1. */
-#define LPC_BASE_UART1_CLK_SRC          0x01
-#define LPC_BASE_UART2_CLK_ENABLE       TRUE    /* Base clock for UART2. */
-#define LPC_BASE_UART2_CLK_SRC          0x01
-#define LPC_BASE_UART3_CLK_ENABLE       TRUE    /* Base clock for UART3. */
-#define LPC_BASE_UART3_CLK_SRC          0x01
-#define LPC_BASE_OUT_CLK_ENABLE         FALSE   /* Base clock for UART0. */
-#define LPC_BASE_OUT_CLK_SRC            0x01
-#define LPC_BASE_APLL_CLK_ENABLE        FALSE   /* Base clock for audio system.  */
-#define LPC_BASE_APLL_CLK_SRC           0x01
-#define LPC_BASE_CGU_OUT0_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT0 clock output. */
-#define LPC_BASE_CGU_OUT0_CLK_SRC       0x01
-#define LPC_BASE_CGU_OUT1_CLK_ENABLE    FALSE   /* Base clock for CGU_OUT1 clock output. */
-#define LPC_BASE_CGU_OUT1_CLK_SRC       0x01
-
-/*
- * GPT driver system settings.
- */
-#define LPC_GPT_USE_TIM0                TRUE
-#define LPC_GPT_USE_TIM1                TRUE
-#define LPC_GPT_USE_TIM2                FALSE
-#define LPC_GPT_USE_TIM3                FALSE
-#define LPC_GPT_TIM0_IRQ_PRIORITY       2
-#define LPC_GPT_TIM1_IRQ_PRIORITY       2
-#define LPC_GPT_TIM2_IRQ_PRIORITY       2
-#define LPC_GPT_TIM3_IRQ_PRIORITY       2
-
-/*
- * SERIAL driver system settings.
- */
-#define LPC_SERIAL_USE_UART0            FALSE
-#define LPC_SERIAL_USE_UART1            FALSE
-#define LPC_SERIAL_USE_UART2            FALSE
-#define LPC_SERIAL_USE_UART3            TRUE
-#define LPC_SERIAL_FIFO_PRELOAD         16
-#define LPC_SERIAL_UART0_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART1_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART2_IRQ_PRIORITY   3
-#define LPC_SERIAL_UART3_IRQ_PRIORITY   3
-
-/*
- * I2C driver system settings.
- */
-#define LPC_I2C_USE_I2C0                FALSE
-#define LPC_I2C_USE_I2C1                FALSE
-#define LPC_I2C_I2C0_IRQ_PRIORITY       3
-#define LPC_I2C_I2C1_IRQ_PRIORITY       3
-
-/*
- * SPI driver system settings.
- */
-#define LPC_SPI_USE_SSP0                FALSE
-#define LPC_SPI_USE_SSP1                FALSE
-#define LPC_SPI_SSP0_IRQ_PRIORITY       5
-#define LPC_SPI_SSP1_IRQ_PRIORITY       5
-
-/*
- * RTC driver system settings.
- */
-#define LPC_RTC_IS_CALENDAR             TRUE
-#define LPC_RTC_USE_ALARM               TRUE
-#define LPC_RTC_IRQ_PRIORITY            3
diff --git a/testhal/SPC560BCxx/CAN/Makefile b/testhal/SPC560BCxx/CAN/Makefile
deleted file mode 100644
index 97618eebb..000000000
--- a/testhal/SPC560BCxx/CAN/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS   = -DSPC560B50L5

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS  =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS   =

-

-#

-# End of default section

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc560bcxx_1.0.0.201302201417/component/lib/rsc/rules.mk

diff --git a/testhal/SPC560BCxx/CAN/chconf.h b/testhal/SPC560BCxx/CAN/chconf.h
deleted file mode 100644
index 8800269d4..000000000
--- a/testhal/SPC560BCxx/CAN/chconf.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560BCxx/CAN/halconf.h b/testhal/SPC560BCxx/CAN/halconf.h
deleted file mode 100644
index c316bb385..000000000
--- a/testhal/SPC560BCxx/CAN/halconf.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 TRUE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL               TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560BCxx/CAN/main.c b/testhal/SPC560BCxx/CAN/main.c
deleted file mode 100644
index 8525d7ddd..000000000
--- a/testhal/SPC560BCxx/CAN/main.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND5, PE_LED1};

-

-/*

- * Internal loopback mode, 500kBaud.

- * See chapter 25 on the SPC5 reference manual.

- */

-static const CANConfig cancfg = {

-  CAN_MCR_WRN_EN,

-  CAN_CTRL_LPB | CAN_CTRL_PROPSEG(2) | CAN_CTRL_PSEG2(7) |

-  CAN_CTRL_PSEG1(3) | CAN_CTRL_PRESDIV(3)

-#if SPC5_CAN_USE_FILTERS

-  ,

-  {

-   {0, 0x00000001},

-   {1, 0x01234567},

-   {0, 0x00000000},

-   {0, 0x00000003},

-   {0, 0x00000004},

-   {0, 0x00000005},

-   {0, 0x00000006},

-   {0, 0x00000007}

-  }

-#endif

-};

-

-#if SPC5_CAN_USE_FILTERS

-flagsmask_t rxFlag;

-#endif

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-#if SPC5_CAN_USE_FILTERS

-  rxFlag = chEvtGetAndClearFlagsI(&el);

-#endif

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-#if !SPC5_CAN_USE_FILTERS

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_E, cip->led);

-    }

-#else

-    while (canReceive(cip->canp, rxFlag,

-                       &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_E, cip->led);

-    }

-#endif

-  }

-  chEvtUnregister(&CAND5.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.LENGTH = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND5, 1, &txmsg, MS2ST(100));

-    palTogglePad(PORT_E, PE_LED2);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN driver 1.

-   */

-  canStart(&CAND5, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx_wa, sizeof(can_rx_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

diff --git a/testhal/SPC560BCxx/CAN/mcuconf.h b/testhal/SPC560BCxx/CAN/mcuconf.h
deleted file mode 100644
index fc8b78dba..000000000
--- a/testhal/SPC560BCxx/CAN/mcuconf.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*

- * Licensed under ST Liberty SW License Agreement V2, (the "License");

- * You may not use this file except in compliance with the License.

- * You may obtain a copy of the License at:

- *

- *        http://www.st.com/software_license_agreement_liberty_v2

- *

- * Unless required by applicable law or agreed to in writing, software 

- * distributed under the License is distributed on an "AS IS" BASIS, 

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-/*

- * SPC560B/Cxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC560BCxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               1

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_XOSCDIV_VALUE                  1

-#define SPC5_IRCDIV_VALUE                   1

-#define SPC5_PERIPHERAL1_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL2_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL3_CLK_DIV_VALUE      2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0 |             \

-                                             SPC5_ME_ME_STANDBY0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STANDBY0_MC_BITS            (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC0_BITS                0

-#define SPC5_ME_RUN_PC1_BITS                (SPC5_ME_RUN_PC_TEST |          \

-                                             SPC5_ME_RUN_PC_SAFE |          \

-                                             SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC2_BITS                (SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC0_BITS                 0

-#define SPC5_ME_LP_PC1_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0 |          \

-                                             SPC5_ME_LP_PC_STANDBY0)

-#define SPC5_ME_LP_PC2_BITS                 (SPC5_ME_LP_PC_HALT0)

-#define SPC5_ME_LP_PC3_BITS                 (SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * CAN driver system settings.

- */

-#define SPC5_CAN_USE_FILTERS                TRUE

-

-#define SPC5_CAN_USE_FLEXCAN0               FALSE

-#define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN1               FALSE

-#define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN1_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN1_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN2               FALSE

-#define SPC5_CAN_FLEXCAN2_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN2_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN2_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN3               FALSE

-#define SPC5_CAN_FLEXCAN3_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN3_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN3_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN4               TRUE

-#define SPC5_CAN_FLEXCAN4_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN4_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN4_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN5               FALSE

-#define SPC5_CAN_FLEXCAN5_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN5_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN5_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560BCxx/CAN/readme.txt b/testhal/SPC560BCxx/CAN/readme.txt
deleted file mode 100644
index 78f7e7cd5..000000000
--- a/testhal/SPC560BCxx/CAN/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - CAN drivers demo for SPC560BCxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560BCxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560BCxx CAN drivers.

-

-** Board Setup **

-

-- Enable LED1 and LED2.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC560BCxx/ICU-PWM/Makefile b/testhal/SPC560BCxx/ICU-PWM/Makefile
deleted file mode 100644
index 9e39b8301..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc560bcxx_1.0.0.201305101230/component/lib/rsc/rules.mk

diff --git a/testhal/SPC560BCxx/ICU-PWM/chconf.h b/testhal/SPC560BCxx/ICU-PWM/chconf.h
deleted file mode 100644
index bebba272e..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   FALSE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560BCxx/ICU-PWM/halconf.h b/testhal/SPC560BCxx/ICU-PWM/halconf.h
deleted file mode 100644
index 24462dafd..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560BCxx/ICU-PWM/main.c b/testhal/SPC560BCxx/ICU-PWM/main.c
deleted file mode 100644
index 11b4a8a23..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/main.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwmpcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(PORT_E, PE_LED1);

-

-}

-

-static void pwmc1cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(PORT_E, PE_LED1);

-}

-

-static PWMConfig pwmcfg = {

-  40000,                                    /* 40kHz PWM clock frequency.*/

-  20000,                                    /* Initial PWM period 0.5s.*/

-  pwmpcb,

-  {

-   {PWM_OUTPUT_ACTIVE_LOW, pwmc1cb},

-   {PWM_OUTPUT_DISABLED, NULL},

-   {PWM_OUTPUT_DISABLED, NULL},

-   {PWM_OUTPUT_DISABLED, NULL},

-   {PWM_OUTPUT_DISABLED, NULL},

-   {PWM_OUTPUT_DISABLED, NULL},

-   {PWM_OUTPUT_DISABLED, NULL}

-  },

-  PWM_ALIGN_EDGE

-};

-

-icucnt_t last_width, last_period;

-

-static void icuwidthcb(ICUDriver *icup) {

-

-  palSetPad(PORT_E, PE_LED2);

-  last_width = icuGetWidth(icup);

-}

-

-static void icuperiodcb(ICUDriver *icup) {

-

-  palClearPad(PORT_E, PE_LED2);

-  last_period = icuGetPeriod(icup);

-}

-

-static ICUConfig icucfg = {

-  ICU_INPUT_ACTIVE_LOW,

-  40000,                                    /* 40kHz ICU clock frequency.*/

-  icuwidthcb,

-  icuperiodcb,

-  NULL

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  palClearPad(PORT_E, PE_LED4);

-

-  /*

-   * Initializes the PWM driver 1 and ICU driver 1.

-   * GPIOA9 is the PWM channel 0 output.

-   * GPIOA0 is the ICU input.

-   * The two pins have to be externally connected together.

-   */

-  icuStart(&ICUD1, &icucfg);

-  icuEnable(&ICUD1);

-

-  /* Sets A0 alternative function.*/

-  SIU.PCR[0].R = 0b0000010100000100;

-

-  /* Sets A9 alternative function.*/

-  SIU.PCR[9U].R = 0b0000011000000100;

-

-  pwmStart(&PWMD1, &pwmcfg);

-

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 0 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 25% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period and the PWM channel 0 to 50% duty cycle.

-   */

-  pwmChangePeriod(&PWMD1, 30000);

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables channel 0 and stops the drivers.

-   */

-  pwmDisableChannel(&PWMD1, 0);

-  pwmStop(&PWMD1);

-

-  icuDisable(&ICUD1);

-  icuStop(&ICUD1);

-

-  palClearPad(PORT_E, PE_LED3);

-  palClearPad(PORT_E, PE_LED4);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC560BCxx/ICU-PWM/mcuconf.h b/testhal/SPC560BCxx/ICU-PWM/mcuconf.h
deleted file mode 100644
index f3a2073cd..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/mcuconf.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC560B/Cxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC560BCxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               1

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_XOSCDIV_VALUE                  1

-#define SPC5_IRCDIV_VALUE                   1

-#define SPC5_PERIPHERAL1_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL2_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL3_CLK_DIV_VALUE      2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0 |             \

-                                             SPC5_ME_ME_STANDBY0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STANDBY0_MC_BITS            (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC0_BITS                0

-#define SPC5_ME_RUN_PC1_BITS                (SPC5_ME_RUN_PC_TEST |          \

-                                             SPC5_ME_RUN_PC_SAFE |          \

-                                             SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC2_BITS                (SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC0_BITS                 0

-#define SPC5_ME_LP_PC1_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0 |          \

-                                             SPC5_ME_LP_PC_STANDBY0)

-#define SPC5_ME_LP_PC2_BITS                 (SPC5_ME_LP_PC_HALT0)

-#define SPC5_ME_LP_PC3_BITS                 (SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-#define SPC5_EMIOS0_GPRE_VALUE              200

-#define SPC5_EMIOS1_GPRE_VALUE              200

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            FALSE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU-PWM driver system settings.

- */

-#define SPC5_ICU_USE_EMIOS0_CH0             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH1             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH2             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH3             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH4             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH5             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH6             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH7             TRUE

-#define SPC5_ICU_USE_EMIOS0_CH24            TRUE

-

-#define SPC5_PWM_USE_EMIOS0_GROUP0          TRUE

-#define SPC5_PWM_USE_EMIOS0_GROUP1          TRUE

-

-#define SPC5_EMIOS0_GFR_F0F1_PRIORITY       7

-#define SPC5_EMIOS0_GFR_F2F3_PRIORITY       7

-#define SPC5_EMIOS0_GFR_F4F5_PRIORITY       7

-#define SPC5_EMIOS0_GFR_F6F7_PRIORITY       7

-#define SPC5_EMIOS0_GFR_F8F9_PRIORITY       7

-#define SPC5_EMIOS0_GFR_F10F11_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F12F13_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F14F15_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F16F17_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F18F19_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F20F21_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F22F23_PRIORITY     7

-#define SPC5_EMIOS0_GFR_F24F25_PRIORITY     7

-

-#define SPC5_EMIOS0_START_PCTL              (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_EMIOS0_STOP_PCTL               (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_EMIOS1_CH24            TRUE

-

-#define SPC5_PWM_USE_EMIOS1_GROUP0          TRUE

-#define SPC5_PWM_USE_EMIOS1_GROUP1          TRUE

-#define SPC5_PWM_USE_EMIOS1_GROUP2          TRUE

-

-#define SPC5_EMIOS1_GFR_F0F1_PRIORITY       7

-#define SPC5_EMIOS1_GFR_F2F3_PRIORITY       7

-#define SPC5_EMIOS1_GFR_F4F5_PRIORITY       7

-#define SPC5_EMIOS1_GFR_F6F7_PRIORITY       7

-#define SPC5_EMIOS1_GFR_F8F9_PRIORITY       7

-#define SPC5_EMIOS1_GFR_F10F11_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F12F13_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F14F15_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F16F17_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F18F19_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F20F21_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F22F23_PRIORITY     7

-#define SPC5_EMIOS1_GFR_F24F25_PRIORITY     7

-

-#define SPC5_EMIOS1_START_PCTL              (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_EMIOS1_STOP_PCTL               (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560BCxx/ICU-PWM/readme.txt b/testhal/SPC560BCxx/ICU-PWM/readme.txt
deleted file mode 100644
index 6c64a8d21..000000000
--- a/testhal/SPC560BCxx/ICU-PWM/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - ICU-PWM driver demo for SPC560BCxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560BCxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560BCxx ICU and PWM drivers.

-

-** Board Setup **

-

-Connect PINA0 and PINA9 together.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC560Dxx/SPI/Makefile b/testhal/SPC560Dxx/SPI/Makefile
deleted file mode 100644
index 833d3878a..000000000
--- a/testhal/SPC560Dxx/SPI/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC560D/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC560Dxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Dxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC560D40.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -D_SPC560P50L5_

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC560Dxx/SPI/UDE/debug .wsx b/testhal/SPC560Dxx/SPI/UDE/debug .wsx
deleted file mode 100644
index 8a1dc048c..000000000
--- a/testhal/SPC560Dxx/SPI/UDE/debug .wsx
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<stg format="2.0">

-	<OriginalWsp type="string">debug .wsx</OriginalWsp><BackupWspFlag type="flag">0</BackupWspFlag><UseWspCnt type="int">0</UseWspCnt><WspCloseCnt type="int">2</WspCloseCnt><ProdInfo type="bin" size="52">vQTv/gAAAQAXAAIA6AkIAAAABAAAAAAAPwAAAAAAAAAEAAAAAgAAAAAAAAAAAAAAAAAAAA==</ProdInfo><ProdInfoString type="string">4.0</ProdInfoString><CreationDate type="string">19.11.2012 16:18:08:999</CreationDate><MainFrame type="key"><PersistTreeRoot type="key"><DesktopState type="key"><Placement type="key"><MainFrame type="string">MCAAAAAAAAAAAAAABAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPHHAAAAAAPBAAAAAADGFAAAAABCDAAAAA</MainFrame><WorkbookMode type="string">False</WorkbookMode><DockStateSaved type="string">True</DockStateSaved></Placement><DockState type="key"><Bars type="string">14</Bars><ScreenCX type="string">1680</ScreenCX><ScreenCY type="string">1050</ScreenCY><Bar-0 type="key"><BarID type="string">59393</BarID><Style type="string">32768</Style><ExStyle type="string">0</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">1000000</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">0</MRUHorzDockCX><MRUHorzDockCY type="string">0</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">0</DockingStyle><TypeID type="string">0</TypeID><ClassName type="string">UDEStatusBar</ClassName><WindowName type="string">For Help, press F1</WindowName><ResourceID type="string">0</ResourceID></Bar-0><Bar-1 type="key"><BarID type="string">59419</BarID><Bars type="string">11</Bars><Bar_0 type="string" name="Bar#0">0</Bar_0><Bar_1 type="string" name="Bar#1">59647</Bar_1><Bar_2 type="string" name="Bar#2">0</Bar_2><Bar_3 type="string" name="Bar#3">59399</Bar_3><Bar_4 type="string" name="Bar#4">59398</Bar_4><Bar_5 type="string" name="Bar#5">59397</Bar_5><Bar_6 type="string" name="Bar#6">59403</Bar_6><Bar_7 type="string" name="Bar#7">59401</Bar_7><Bar_8 type="string" name="Bar#8">59406</Bar_8><Bar_9 type="string" name="Bar#9">59402</Bar_9><Bar_10 type="string" name="Bar#10">0</Bar_10><Style type="string">0</Style><ExStyle type="string">0</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">0</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">0</MRUHorzDockCX><MRUHorzDockCY type="string">0</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">0</DockingStyle><TypeID type="string">0</TypeID><ClassName type="string">CUDEDockBar</ClassName><WindowName type="string"></WindowName><ResourceID type="string">0</ResourceID></Bar-1><Bar-2 type="key"><BarID type="string">59422</BarID><Bars type="string">3</Bars><Bar_0 type="string" name="Bar#0">0</Bar_0><Bar_1 type="string" name="Bar#1">9110</Bar_1><Bar_2 type="string" name="Bar#2">0</Bar_2><Style type="string">0</Style><ExStyle type="string">0</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">0</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">0</MRUHorzDockCX><MRUHorzDockCY type="string">0</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">0</DockingStyle><TypeID type="string">0</TypeID><ClassName type="string">CUDEDockBar</ClassName><WindowName type="string"></WindowName><ResourceID type="string">0</ResourceID></Bar-2><Bar-3 type="key"><BarID type="string">59420</BarID><Bars type="string">3</Bars><Bar_0 type="string" name="Bar#0">0</Bar_0><Bar_1 type="string" name="Bar#1">9100</Bar_1><Bar_2 type="string" name="Bar#2">0</Bar_2><Style type="string">0</Style><ExStyle type="string">0</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">0</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">0</MRUHorzDockCX><MRUHorzDockCY type="string">0</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">0</DockingStyle><TypeID type="string">0</TypeID><ClassName type="string">CUDEDockBar</ClassName><WindowName type="string"></WindowName><ResourceID type="string">0</ResourceID></Bar-3><Bar-4 type="key"><BarID type="string">59647</BarID><MRUWidth type="string">381</MRUWidth><Docking type="string">True</Docking><MRUDockID type="string">59419</MRUDockID><MRUDockLeftPos type="string">-1</MRUDockLeftPos><MRUDockTopPos type="string">-1</MRUDockTopPos><MRUDockRightPos type="string">1251</MRUDockRightPos><MRUDockBottomPos type="string">26</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12220</Style><ExStyle type="string">908</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">1000000</PctWidth><MRUFloatCX type="string">381</MRUFloatCX><MRUFloatCY type="string">27</MRUFloatCY><MRUHorzDockCX type="string">1252</MRUHorzDockCX><MRUHorzDockCY type="string">27</MRUHorzDockCY><MRUVertDockCX type="string">76</MRUVertDockCX><MRUVertDockCY type="string">511</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14947</TypeID><ClassName type="string">UDEMDIMenuBar</ClassName><WindowName type="string">Menu bar</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Menu bar</Title><Buttons type="string">BAAAAAAIAACAAAAAAIAADAAAAAAIAAEAAAAAAIAAFAAAAAAIAAGAAAAAAIAAHAAAAAAIAAIAAAAAAIAAJAAAAAAIAAKAAAAAAIAA</Buttons></ToolBarInfoEx></Bar-4><Bar-5 type="key"><BarID type="string">59398</BarID><XPos type="string">503</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">503</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">614</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">15625</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">111</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Edit</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Edit</Title><NewButtons_BinCount type="string">2</NewButtons_BinCount><NewButtons_BinVal0 type="string">DCBOAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAACCBOAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAFCBOAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAIABOAAAAAAPPPPPPPPAAAAAAAAAA</NewButtons_BinVal0><NewButtons_BinVal1 type="string">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAA</NewButtons_BinVal1></ToolBarInfoEx></Bar-5><Bar-6 type="key"><BarID type="string">59397</BarID><XPos type="string">614</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">614</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">794</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">15625</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">180</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">File</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">File</Title><NewButtons_BinCount type="string">3</NewButtons_BinCount><NewButtons_BinVal0 type="string">AHHBAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAABHHBAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAACHHBAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAADHHBAAAAAAPPPPPPPPAAAAAAAAAA</NewButtons_BinVal0><NewButtons_BinVal1 type="string">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAEHHBAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAFHHBAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAOKHBAAAAAABAAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAA</NewButtons_BinVal1><NewButtons_BinVal2 type="string">AAPPPPPPPPAAAAAAAA</NewButtons_BinVal2></ToolBarInfoEx></Bar-6><Bar-7 type="key"><BarID type="string">59403</BarID><XPos type="string">794</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">794</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">928</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">1181049967</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">31250</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">134</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Config</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Config</Title><NewButtons_BinCount type="string">2</NewButtons_BinCount><NewButtons_BinVal0 type="string">GJHBAAAAAADAAAAAAADBGGJPINFFOGHPIEPKKCPFOMBDBNDAKPAAAAAAAAPPPPPPPPAAAAAAAAMMHBAAAAAAOPAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAANMHBAAAAAAAABAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAAFNHBAAAAAAGAAAAAAAKBDLFIMBFC</NewButtons_BinVal0><NewButtons_BinVal1 type="string">NFHJBEGJFDMJNFCMOIPKHNAAAAAAAAPPPPPPPPAAAAAAAAINHBAAAAAACBAAAAAADBGGJPINFFOGHPIEPKKCPFOMBDBNDAKPAAAAAAAAPPPPPPPPAAAAAAAA</NewButtons_BinVal1></ToolBarInfoEx></Bar-7><Bar-8 type="key"><BarID type="string">59401</BarID><XPos type="string">928</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">928</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">1407</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">151587341</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">62500</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">479</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Views</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Views</Title><NewButtons_BinCount type="string">6</NewButtons_BinCount><NewButtons_BinVal0 type="string">JJHBAAAAAAFBAAAAAADBGGJPINFFOGHPIEPKKCPFOMBDBNDAKPAAAAAAAAPPPPPPPPAAAAAAAAKJHBAAAAAAPAAAAAAADBGGJPINFFOGHPIEPKKCPFOMBDBNDAKPAAAAAAAAPPPPPPPPAAAAAAAAMJHBAAAAAAGBAAAAAADBGGJPINFFOGHPIEPKKCPFOMBDBNDAKPAAAAAAAAPPPPPPPPAAAAAAAANKHBAAAAAAAAAAAAAAAGKBFNONHL</NewButtons_BinVal0><NewButtons_BinVal1 type="string">AOENBBBJCBAABADAJECGGLAAAAAAAAPPPPPPPPAAAAAAAAALHBAAAAAAKAAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAACLHBAAAAAAMFAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAADLHBAAAAAAKFAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAA</NewButtons_BinVal1><NewButtons_BinVal2 type="string">AAPPPPPPPPAAAAAAAAFLHBAAAAAANCAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAAGLHBAAAAAAMDAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAAHLHBAAAAAAGEAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAAAMHBAAAAAA</NewButtons_BinVal2><NewButtons_BinVal3 type="string">KAAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAABMHBAAAAAAEBAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAACMHBAAAAAAJBAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAADMHBAAAAAALBAAAAAAKEMNADOLNFNPBMHEJJNE</NewButtons_BinVal3><NewButtons_BinVal4 type="string">MIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAAEMHBAAAAAAAFAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAAFMHBAAAAAAICAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAAHMHBAAAAAANEEAAAAAJEOEILFFBLMIPBEEPLLMEDEOPKHPBGJHAAAAAAAAPPPPPPPP</NewButtons_BinVal4><NewButtons_BinVal5 type="string">AAAAAAAAIMHBAAAAAAGFEAAAAAJEOEILFFBLMIPBEEPLLMEDEOPKHPBGJHAAAAAAAAPPPPPPPPAAAAAAAAJMHBAAAAAAAGEAAAAAJEOEILFFBLMIPBEEPLLMEDEOPKHPBGJHAAAAAAAAPPPPPPPPAAAAAAAALMHBAAAAAAGEAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAA</NewButtons_BinVal5></ToolBarInfoEx></Bar-8><Bar-9 type="key"><BarID type="string">59406</BarID><XPos type="string">1407</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">1407</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">1653</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">125000</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">246</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Macro</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Macro</Title><NewButtons_BinCount type="string">2</NewButtons_BinCount><NewButtons_BinVal0 type="string">DKHBAAAAAALDAAAAAAGDHJMPFPDOOJLAGELLAIHGBMMEFJBIPLAAAAAAAAPPPPPPPPAAAAAAAAEKHBAAAAAAAEAAAAAAGDHJMPFPDOOJLAGELLAIHGBMMEFJBIPLAAAAAAAAPPPPPPPPAAAAAAAAGKHBAAAAAAMDAAAAAAGDHJMPFPDOOJLAGELLAIHGBMMEFJBIPLAAAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAAA</NewButtons_BinVal0><NewButtons_BinVal1 type="string">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAMKHBAAAACAGJAAAAAAAAAANMAJBFNENHHACJPEILAJFEFEECLCDPKCBAAAAAAAKAAAAAAANAAAAAAAFFEEFEHFPGCHLGDHAHBGDGFGAA</NewButtons_BinVal1></ToolBarInfoEx></Bar-9><Bar-10 type="key"><BarID type="string">59399</BarID><YPos type="string">26</YPos><MRUWidth type="string">504</MRUWidth><Docking type="string">True</Docking><MRUDockID type="string">59419</MRUDockID><MRUDockLeftPos type="string">-1</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">503</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">250000</PctWidth><MRUFloatCX type="string">504</MRUFloatCX><MRUFloatCY type="string">30</MRUFloatCY><MRUHorzDockCX type="string">504</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">123</MRUVertDockCX><MRUVertDockCY type="string">90</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Debug</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Debug</Title><NewButtons_BinCount type="string">5</NewButtons_BinCount><NewButtons_BinVal0 type="string">BLHBAAAAAAIBAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAAELHBAAAAAAOFAAAAAALGLJALHCJPMBOILEPIDADGENFBIDFOCNAAAAAAAAPPPPPPPPAAAAAAAAILHBAAAAAAHAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAJLHBAAAAAAJAAAAAAABINLNCJGPD</NewButtons_BinVal0><NewButtons_BinVal1 type="string">KECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAKLHBAAAAAAKAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAALLHBAAAAAALAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAMLHBAAAAAAIAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAA</NewButtons_BinVal1><NewButtons_BinVal2 type="string">AAPPPPPPPPAAAAAAAANLHBAAAAAABCDAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAOLHBAAAAAANAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAPLHBAAAAAAMAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAA</NewButtons_BinVal2><NewButtons_BinVal3 type="string">PPPPPPPPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAANHBAAAAAADAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAABNHBAAAAAAGAAAAAAABINLNCJGPDKECNBBCLNMAAAKECHFPLPAAAAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAAAAAAAAAAAAAA</NewButtons_BinVal3><NewButtons_BinVal4 type="string">AAAAAAAAAAAAAAAAAAAAPPPPPPPPAAAAAAAACNHBAAAACAKKAAAAAAAAAADHHMLHLPEKIIOMOEJLGLBHJIBGLAHAFDBAAAAAAADAAAAAAAFAAAAAAADEPGCHFGAAENHBAAAAAADAAAAAAAKBDLFIMBFCNFHJBEGJFDMJNFCMOIPKHNAAAAAAAAPPPPPPPPAAAAAAAA</NewButtons_BinVal4></ToolBarInfoEx></Bar-10><Bar-11 type="key"><BarID type="string">59402</BarID><XPos type="string">1653</XPos><YPos type="string">26</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">1653</MRUDockLeftPos><MRUDockTopPos type="string">26</MRUDockTopPos><MRUDockRightPos type="string">1795</MRUDockRightPos><MRUDockBottomPos type="string">56</MRUDockBottomPos><MRUFloatStyle type="string">8196</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">12212</Style><ExStyle type="string">780</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">500000</PctWidth><MRUFloatCX type="string">0</MRUFloatCX><MRUFloatCY type="string">0</MRUFloatCY><MRUHorzDockCX type="string">142</MRUHorzDockCX><MRUHorzDockCY type="string">30</MRUHorzDockCY><MRUVertDockCX type="string">0</MRUVertDockCX><MRUVertDockCY type="string">0</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14946</TypeID><ClassName type="string">CUdeCustomToolBar</ClassName><WindowName type="string">Tools</WindowName><ResourceID type="string">0</ResourceID><ToolBarInfoEx type="key"><Title type="string">Tools</Title><NewButtons type="string">DNHBAAAACAEGAAAAAAAAAAGEAOMHHDMDCIFAKEIIICDBCMNFEDNFHHBAAAAAAAGAAAAAAAFAAAAAAADEPGCHFGAAHNHBAAAAAABOAAAAAAKEMNADOLNFNPBMHEJJNEMIOMIMCHOAOGAAAAAAAAPPPPPPPPAAAAAAAA</NewButtons></ToolBarInfoEx></Bar-11><Bar-12 type="key"><BarID type="string">9110</BarID><XPos type="string">1</XPos><YPos type="string">5</YPos><Docking type="string">True</Docking><MRUDockID type="string">59422</MRUDockID><MRUDockLeftPos type="string">1</MRUDockLeftPos><MRUDockTopPos type="string">5</MRUDockTopPos><MRUDockRightPos type="string">1252</MRUDockRightPos><MRUDockBottomPos type="string">155</MRUDockBottomPos><MRUFloatStyle type="string">4</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">36756</Style><ExStyle type="string">3889</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">1000000</PctWidth><MRUFloatCX type="string">300</MRUFloatCX><MRUFloatCY type="string">180</MRUFloatCY><MRUHorzDockCX type="string">1251</MRUHorzDockCX><MRUHorzDockCY type="string">150</MRUHorzDockCY><MRUVertDockCX type="string">300</MRUVertDockCX><MRUVertDockCY type="string">180</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14948</TypeID><ClassName type="string">CTabWndControlBar</ClassName><WindowName type="string">Tab Window Bar 0</WindowName><ResourceID type="string">0</ResourceID><ViewServerInstCnt type="string">-1</ViewServerInstCnt><ViewServerMultiInst type="string">False</ViewServerMultiInst><ViewServerType type="string">UDEDesktop Standard Bars</ViewServerType><ViewServerInstName type="string">Tab Window Bar 0</ViewServerInstName><ViewServerDbgSrvCfg type="string">UDEDesktop</ViewServerDbgSrvCfg><ExDockRow type="string">0</ExDockRow><ExDockCol type="string">0</ExDockCol><ExDockHeight type="string">150</ExDockHeight><NoOfDockBars type="string">1</NoOfDockBars></Bar-12><Bar-13 type="key"><BarID type="string">9100</BarID><Visible type="string">False</Visible><XPos type="string">0</XPos><YPos type="string">0</YPos><Docking type="string">True</Docking><MRUDockID type="string">0</MRUDockID><MRUDockLeftPos type="string">0</MRUDockLeftPos><MRUDockTopPos type="string">0</MRUDockTopPos><MRUDockRightPos type="string">0</MRUDockRightPos><MRUDockBottomPos type="string">0</MRUDockBottomPos><MRUFloatStyle type="string">4</MRUFloatStyle><MRUFloatXPos type="string">-2147483648</MRUFloatXPos><MRUFloatYPos type="string">0</MRUFloatYPos><Style type="string">8084</Style><ExStyle type="string">3889</ExStyle><PrevFloating type="string">False</PrevFloating><MDIChild type="string">False</MDIChild><PctWidth type="string">1000000</PctWidth><MRUFloatCX type="string">300</MRUFloatCX><MRUFloatCY type="string">180</MRUFloatCY><MRUHorzDockCX type="string">300</MRUHorzDockCX><MRUHorzDockCY type="string">180</MRUHorzDockCY><MRUVertDockCX type="string">150</MRUVertDockCX><MRUVertDockCY type="string">180</MRUVertDockCY><MRUDockingState type="string">0</MRUDockingState><DockingStyle type="string">61440</DockingStyle><TypeID type="string">14948</TypeID><ClassName type="string">CUdeProjectWspBar</ClassName><WindowName type="string">Project Workspace Bar</WindowName><ResourceID type="string">0</ResourceID><ViewServerInstCnt type="string">-1</ViewServerInstCnt><ViewServerMultiInst type="string">False</ViewServerMultiInst><ViewServerType type="string">UDEDesktop Standard Bars</ViewServerType><ViewServerInstName type="string">Project Workspace Bar</ViewServerInstName><ViewServerDbgSrvCfg type="string">UDEDesktop</ViewServerDbgSrvCfg><ExDockRow type="string">0</ExDockRow><ExDockCol type="string">0</ExDockCol><ExDockHeight type="string">0</ExDockHeight><NoOfDockBars type="string">1</NoOfDockBars></Bar-13></DockState><ToolBarMgr type="key"><ToolTips type="string">True</ToolTips><CoolLook type="string">True</CoolLook><LargeButtons type="string">False</LargeButtons></ToolBarMgr></DesktopState></PersistTreeRoot><StdTargetManagerWin type="key"><OPEN_VIEW type="key"><FrameCreated type="string">21.11.2012 14:43:52:278</FrameCreated><ViewSrv type="key"><TargetBrowserView type="key"><SplitterRatio type="int">48</SplitterRatio></TargetBrowserView></ViewSrv><NETFrameMode type="int">77824</NETFrameMode><NETFrameSaveIndex type="int">1</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">1</CommonVisibilityGroup><VisibilityGroup_1 type="string">WorkspaceManager</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><SAVED_VIEW type="int">0</SAVED_VIEW></StdTargetManagerWin><StdUDEMessageWin type="key"><OPEN_VIEW type="key"><FrameCreated type="string">19.11.2012 16:28:52:057</FrameCreated><ViewSrv type="key"><LogWin type="key"><Index type="key"><Width type="bin" size="8">MgAAAA==</Width><Visible type="bin" size="8">AQAAAA==</Visible></Index><Type type="key"><Width type="bin" size="8">ZAAAAA==</Width><Visible type="bin" size="8">AQAAAA==</Visible></Type><Time type="key"><Width type="bin" size="8">ZAAAAA==</Width><Visible type="bin" size="8">AQAAAA==</Visible></Time><Src type="key"><Width type="bin" size="8">lgAAAA==</Width><Visible type="bin" size="8">AQAAAA==</Visible></Src><Msg type="key"><Width type="bin" size="8">6AMAAA==</Width><Visible type="bin" size="8">AQAAAA==</Visible></Msg></LogWin><CmdWin type="key"><History type="key"/></CmdWin></ViewSrv><FrameDockState type="flag">1</FrameDockState><FrameMode type="int">3</FrameMode><NETFrameMode type="int">90112</NETFrameMode><NETFrameSaveIndex type="int">0</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">1</CommonVisibilityGroup><VisibilityGroup_1 type="string">WorkspaceManager</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><SAVED_VIEW type="int">0</SAVED_VIEW></StdUDEMessageWin><StdUDECmdWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDECmdWin><UDETraceWin2 type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></UDETraceWin2><StdUDEWspHTMLView type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDEWspHTMLView><Tab_Window_Bar_0 type="key" name="Tab Window Bar 0"><ProjectOpenFlag type="flag">1</ProjectOpenFlag><FrameDockState type="flag">1</FrameDockState><ProjectLastActivePage type="int">0</ProjectLastActivePage></Tab_Window_Bar_0><Project_Workspace_Bar type="key" name="Project Workspace Bar"><ProjectOpenFlag type="flag">0</ProjectOpenFlag><FrameDockState type="flag">1</FrameDockState><ProjectLastActivePage type="int">0</ProjectLastActivePage></Project_Workspace_Bar><TraceFramework type="key"/><SelectedPrinter type="string">\\napnt002.nap.st.com\NAPPRT0001</SelectedPrinter><VisibilityGroupsMgr type="key"><Core type="key"><UsePrimaryGroup type="flag">0</UsePrimaryGroup><UseLastUsedGroup type="flag">0</UseLastUsedGroup></Core><VisibilityGroup_1 type="key"><NoOfDebugger type="int">0</NoOfDebugger><DefaultGroupName type="string">WorkspaceManager</DefaultGroupName><GroupName type="string">WorkspaceManager</GroupName><PrimaryGroup type="flag">0</PrimaryGroup><CommonGroup type="flag">1</CommonGroup></VisibilityGroup_1><VisibilityGroup_2 type="key"><Debugger_1 type="string">Core</Debugger_1><NoOfDebugger type="int">1</NoOfDebugger><DefaultGroupName type="string">Target0.Controller0.Core</DefaultGroupName><GroupName type="string">Target0.Controller0.Core</GroupName><PrimaryGroup type="flag">1</PrimaryGroup><CommonGroup type="flag">0</CommonGroup></VisibilityGroup_2><NoOfDefaultVisibilityGroups type="int">2</NoOfDefaultVisibilityGroups><NoOfVisibilityGroups type="int">2</NoOfVisibilityGroups><EnableUserSwitchOfVisibilityGroups type="flag">0</EnableUserSwitchOfVisibilityGroups><EnableDebuggerSwitchOfVisibilityGroups type="flag">0</EnableDebuggerSwitchOfVisibilityGroups><VisibilityGroupsCtrlTBCat type="int">7</VisibilityGroupsCtrlTBCat><EnableVisibilityGroups type="flag">0</EnableVisibilityGroups></VisibilityGroupsMgr><NETPlacementRoot type="key"><FormsData type="innerxml"><FormsData><Bounds><X>143</X><Y>83</Y><Width>1295</Width><Height>778</Height></Bounds><ClientSize><Width>1279</Width><Height>740</Height></ClientSize><State>Normal</State></FormsData></FormsData><DockingManagerControlData type="innerxml"><DockingManagerControlData><MDIActive>false</MDIActive><DocumentDockStyle>Top</DocumentDockStyle><DockingControls><DockingControlData><DockedDimension>1271</DockedDimension><Cancelled>false</Cancelled><DockingType>Bottom</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>0</DockingIndex><PanelIndex>0</PanelIndex><ContainerType>DockPanel</ContainerType><Selected>true</Selected></DockingControlData><DockingControlData><DockedDimension>417</DockedDimension><Cancelled>false</Cancelled><DockingType>Left</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>0</DockingIndex><PanelIndex>0</PanelIndex><ContainerType>DockPanel</ContainerType><Selected>true</Selected></DockingControlData><DockingControlData><DockedDimension>417</DockedDimension><Cancelled>false</Cancelled><DockingType>Left</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>1</DockingIndex><PanelIndex>0</PanelIndex><ContainerType>DockPanel</ContainerType><Selected>false</Selected></DockingControlData><DockingControlData><DockedDimension>0</DockedDimension><Cancelled>false</Cancelled><DockingType>Top</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>0</DockingIndex><PanelIndex>-1</PanelIndex><ContainerType>TabbedDocument</ContainerType><Selected>true</Selected></DockingControlData><DockingControlData><DockedDimension>417</DockedDimension><Cancelled>false</Cancelled><DockingType>Left</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>2</DockingIndex><PanelIndex>0</PanelIndex><ContainerType>DockPanel</ContainerType><Selected>false</Selected></DockingControlData><DockingControlData><DockedDimension>417</DockedDimension><Cancelled>false</Cancelled><DockingType>Left</DockingType><FloatingBounds><X>0</X><Y>0</Y><Width>0</Width><Height>0</Height></FloatingBounds><AutoHide>false</AutoHide><AutoHideByContextSwitch>false</AutoHideByContextSwitch><DockingIndex>3</DockingIndex><PanelIndex>0</PanelIndex><ContainerType>DockPanel</ContainerType><Selected>false</Selected></DockingControlData></DockingControls><LeftDockingContainerControlData><DockingContainerControlData><Tabbed>true</Tabbed><Dimension>556</Dimension></DockingContainerControlData></LeftDockingContainerControlData><RightDockingContainerControlData><DockingContainerControlData><Tabbed>false</Tabbed><Dimension>200</Dimension></DockingContainerControlData></RightDockingContainerControlData><TopDockingContainerControlData><DockingContainerControlData><Tabbed>false</Tabbed><Dimension>200</Dimension></DockingContainerControlData></TopDockingContainerControlData><BottomDockingContainerControlData><DockingContainerControlData><Tabbed>true</Tabbed><Dimension>200</Dimension></DockingContainerControlData></BottomDockingContainerControlData><TabbedDocumentContainerControlData><TabbedDocumentContainerControlData><Selected>true</Selected><SplitterSize>100</SplitterSize></TabbedDocumentContainerControlData></TabbedDocumentContainerControlData></DockingManagerControlData></DockingManagerControlData><ToolbarControlData type="innerxml"><ToolbarControlData><ShowPanelShortcuts>true</ShowPanelShortcuts><ShowToolItemMessages>true</ShowToolItemMessages><TopContainer><PanelBounds><X>0</X><Y>0</Y><Width>1279</Width><Height>74</Height></PanelBounds><ToolBars><ToolbarPersistData><Bounds><X>0</X><Y>0</Y><Width>1279</Width><Height>24</Height></Bounds><Name>Platform Main Menu</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData/></ToolbarPersistData><ToolbarPersistData><Bounds><X>4</X><Y>24</Y><Width>95</Width><Height>25</Height></Bounds><Name>Edit Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_Workspace_0x1779</Name><Visible>true</Visible><Text>Cut</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x177A</Name><Visible>true</Visible><Text>Copy</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x177B</Name><Visible>true</Visible><Text>Paste</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>99</X><Y>24</Y><Width>276</Width><Height>25</Height></Bounds><Name>Macro Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_0x3B_{F5FC9736-9EE3-460B-BB80-67C14C9581BF}</Name><Visible>true</Visible><Text>Run Macro</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x40_{F5FC9736-9EE3-460B-BB80-67C14C9581BF}</Name><Visible>true</Visible><Text>Debug Macro</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x3_{F5FC9736-9EE3-460B-BB80-67C14C9581BF}</Name><Visible>true</Visible><Text>Break Macro</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x3C_{F5FC9736-9EE3-460B-BB80-67C14C9581BF}</Name><Visible>true</Visible><Text>Reload Macro</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Ctrl_{4D5190CD-077D-4F92-B890-4545242BF32A}_UDEWorkspace</Name><Visible>true</Visible><Text/><DisplayStyle>ImageAndText</DisplayStyle><AppendAccelerator>false</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>375</X><Y>24</Y><Width>210</Width><Height>25</Height></Bounds><Name>File Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_Workspace_0x1770</Name><Visible>true</Visible><Text>New Workspace</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x1771</Name><Visible>true</Visible><Text>Open workspace</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x1772</Name><Visible>true</Visible><Text>Save workspace as</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x1773</Name><Visible>true</Visible><Text>Save workspace</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x1774</Name><Visible>true</Visible><Text>Close workspace</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x177F</Name><Visible>true</Visible><Text>Export view content</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Workspace_0x1778</Name><Visible>true</Visible><Text>Print</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x1_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Load Program</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>585</X><Y>24</Y><Width>440</Width><Height>25</Height></Bounds><Name>Views Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_0x4_{D8F96613-6E55-48F7-AF2A-5FCE31D103FA}</Name><Visible>true</Visible><Text>Target Browser</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x15_{D8F96613-6E55-48F7-AF2A-5FCE31D103FA}</Name><Visible>true</Visible><Text>Diagnostic Message Viewer</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xF_{D8F96613-6E55-48F7-AF2A-5FCE31D103FA}</Name><Visible>true</Visible><Text>Console</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x0_{DED51A60-E0B7-11D4-9112-0001034962B6}</Name><Visible>true</Visible><Text>CPU Window</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x1E_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Explore Symbols</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xA_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Program</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x5C_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Single Program Window</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x5A_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Disassembly Window</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x2D_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Show Special Function Register</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x3C_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Locals</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x46_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Watch</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xA_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Simulated I/O</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x14_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>UDE HTML</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x19_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Array Chart</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x1B_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Time Traced Signal Chart</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x50_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>IP Trace Profiling</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x28_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Memory</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x46_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Call Stack</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>3</X><Y>49</Y><Width>509</Width><Height>25</Height></Bounds><Name>Debug Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_0x18_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Show IP</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x5E_{27B09B6B-1CF9-4B8E-8F03-63D41538E5D2}</Name><Visible>true</Visible><Text>Show program code</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x7_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Start Program</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x9_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Step Over</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xA_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Step Into</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xB_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Step Out</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x8_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Run Cursor</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x321_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Break Program</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xD_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Reset</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xC_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Restart Program</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x3_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Breakpoints</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x6_{692DBD81-4A3F-11D2-B2CD-00A02457BF0F}</Name><Visible>true</Visible><Text>Toggle Break</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_Ctrl_{FB7BC773-88A4-4ECE-B9B6-7189610B0735}_Core</Name><Visible>true</Visible><Text/><DisplayStyle>ImageAndText</DisplayStyle><AppendAccelerator>false</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x3_{1C85B31A-5D25-4197-9635-9C5DC28EAFD7}</Name><Visible>true</Visible><Text>Trigger setup</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>512</X><Y>49</Y><Width>141</Width><Height>25</Height></Bounds><Name>Config Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_0x3_{D8F96613-6E55-48F7-AF2A-5FCE31D103FA}</Name><Visible>true</Visible><Text>Target Configuration</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xFE_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Connect Target</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x100_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Disconnect Target</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x6_{1C85B31A-5D25-4197-9635-9C5DC28EAFD7}</Name><Visible>true</Visible><Text>Setup Target Interface</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0x12_{D8F96613-6E55-48F7-AF2A-5FCE31D103FA}</Name><Visible>true</Visible><Text>MCU Run Control</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>653</X><Y>49</Y><Width>151</Width><Height>25</Height></Bounds><Name>Tools Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData><ToolItemPersistData><Name>UDE_Ctrl_{377CE046-823C-4A05-8828-13C25D345D77}_Core</Name><Visible>true</Visible><Text/><DisplayStyle>ImageAndText</DisplayStyle><AppendAccelerator>false</AppendAccelerator></ToolItemPersistData><ToolItemPersistData><Name>UDE_0xE1_{BE30DC4A-FD5D-47C1-994D-8CCEC8720E6E}</Name><Visible>true</Visible><Text>Execution Time Setup</Text><DisplayStyle>Image</DisplayStyle><AppendAccelerator>true</AppendAccelerator></ToolItemPersistData></ToolItemData></ToolbarPersistData><ToolbarPersistData><Bounds><X>0</X><Y>100</Y><Width>26</Width><Height>25</Height></Bounds><Name>Show Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>false</Visible><ToolItemData/></ToolbarPersistData><ToolbarPersistData><Bounds><X>0</X><Y>200</Y><Width>26</Width><Height>25</Height></Bounds><Name>Window Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>false</Visible><ToolItemData/></ToolbarPersistData><ToolbarPersistData><Bounds><X>0</X><Y>225</Y><Width>26</Width><Height>25</Height></Bounds><Name>Workspace Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>false</Visible><ToolItemData/></ToolbarPersistData><ToolbarPersistData><Bounds><X>0</X><Y>275</Y><Width>26</Width><Height>25</Height></Bounds><Name>Help Toolbar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>false</Visible><ToolItemData/></ToolbarPersistData></ToolBars></TopContainer><BottomContainer><PanelBounds><X>0</X><Y>717</Y><Width>1279</Width><Height>23</Height></PanelBounds><ToolBars><ToolbarPersistData><Bounds><X>0</X><Y>0</Y><Width>1279</Width><Height>23</Height></Bounds><Name>Platform Status Bar</Name><AlwaysUnvisible>false</AlwaysUnvisible><Visible>true</Visible><ToolItemData/></ToolbarPersistData></ToolBars></BottomContainer><LeftContainer><PanelBounds><X>0</X><Y>74</Y><Width>0</Width><Height>643</Height></PanelBounds><ToolBars/></LeftContainer><RightContainer><PanelBounds><X>1279</X><Y>74</Y><Width>0</Width><Height>643</Height></PanelBounds><ToolBars/></RightContainer></ToolbarControlData></ToolbarControlData></NETPlacementRoot></MainFrame><INI_SECTION type="key"><Macro type="key"><MacroLib type="string">..\..\..\..\..\Program Files\pls\UDE 4.0\StdLibrary.mso</MacroLib></Macro><Loader type="key"><LOADER_REGKEY_WSP type="string">{866f82d3-fac5-43cd-8a82-0af01e46e2c5}</LOADER_REGKEY_WSP></Loader><PLACEMENT type="key"><SFRSelectDlg type="string">669,1006,350,661</SFRSelectDlg></PLACEMENT><EXTRAVALUE type="key"><SFRSelectDlg type="int">0</SFRSelectDlg></EXTRAVALUE></INI_SECTION><AddOns type="key"><UDE.Script type="key"><MacroGuiEntries type="key"><LastScriptFilePath type="string">..\..\..\..\..\Documents and Settings\disiriog\My Documents\pls\UDE 4.0</LastScriptFilePath><Macro_14_06_13_14_33_25_0 type="key"><ScriptDescription type="string">The script contains a collection of macros to save memory content into different file formats 

-and fill target memory ranges</ScriptDescription><ScriptPath type="string">V:\UDE\AddOns\Macro\MacroLibrary\StdMacros1.dsm</ScriptPath><ScriptSource type="string">'	

-'	$Header: /Ude/AddOns/Macro/MacroLibrary/StdMacros.dsm 3     30.04.04 9:34 Weisses $

-'_______________________________________________________

-'

-'	universal debug engine

-'	 

-'	Standard command line macros - part 1 

-'

-'	pls Development Tools 1999-2004

-'

-'   28.04.04    SW     correction for UDE 1.10

-'   03.06.03    SW     initial version

-'_______________________________________________________

-

-'_______________________________________________________

-'

-'	UnAss command line function

-' 

-'	generates disassembly file 

-'

-'	command line UnAss output-file range1 [range2] [range3] .....

-'	range description:

-'		C:&lt;startaddress&gt;,&lt;length&gt; or	- code

-'		DB:&lt;startaddress&gt;,&lt;length&gt; or	- data byte

-'		DW:&lt;startaddress&gt;,&lt;length&gt; or	- data word

-'		DD:&lt;startaddress&gt;,&lt;length&gt; or	- data dword

-'_______________________________________________________

-

-Sub UnAss(File,ParameterObj)

-

-	set debugger = workspace.Coredebugger(0)

-	set DisASMObj = debugger.DisASMObj

-	If Not IsObject(ParameterObj) Then

-	  	MsgBox "Number of parameters wrong"

-		Exit Sub 		

-	End If

-	If IsNumeric(File) Then

-	  	MsgBox "File parameter wrong - " &amp; File

-		Exit Sub 		

-	End If

-	DisASMObj.OutputPath = CStr(File)

-	bRetVal = DisASMObj.CreateStream(True,"UDE Disassembler output of current Program",False)

-	If bRetVal = True Then

-		ParmeterCnt = ParameterObj.ParameterCount

-		If ParmeterCnt = 0 Then

-	  		MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-			Exit Sub 		

-		End If

-		If ( ParmeterCnt Mod 3 ) &lt;&gt; 0 Then

-	  		MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-			Exit Sub 		

-		End If

-		RangeCnt = ParmeterCnt/3

-		ParamIndex = 0

-		For Range = 0 To RangeCnt -1 

-			KindOfRange = CStr(ParameterObj.Parameter(ParamIndex)) 

-			KindOfRange = UCase(KindOfRange)

-			Address = CLng(ParameterObj.Parameter(ParamIndex +1))		

-			Length = CLng(ParameterObj.Parameter(ParamIndex +2))

-			ParamIndex = ParamIndex +3

-			If IsNumeric(KindOfRange) Then

-				If KindOfRange = 12 Then

- 					DisASMObj.AddRange Address,Length,1

-				ElseIf KindOfRange = 219 Then

- 					DisASMObj.AddRange Address,Length,2

-				ElseIf KindOfRange = 221 Then

- 					DisASMObj.AddRange Address,Length,4

-				Else

-	  				MsgBox "Invalid range type " &amp; KindOfRange &amp;  "of range " &amp; Range +1

-					Exit Sub 		

-			 	End If

-			Else

-				If KindOfRange = "C" Then

- 					DisASMObj.AddRange Address,Length,1

-				ElseIf KindOfRange = "DB" Then

- 					DisASMObj.AddRange Address,Length,2

-				ElseIf KindOfRange = "DW" Then

- 					DisASMObj.AddRange Address,Length,3

-				ElseIf KindOfRange = "DD" Then

- 					DisASMObj.AddRange Address,Length,4

-				Else

-	  				MsgBox "Invalid range type " &amp; KindOfRange &amp;  "of range " &amp; Range +1

-					Exit Sub 		

-				End If

-			End If

-		Next

-		DisASMObj.HexFileModeFlag = False

-		DisASMObj.ListModeFlag = False

-		DisASMObj.WriteAllRanges(False)

-	End If

-

-End Sub

-

-'_______________________________________________________

-'

-'	SaveHEX command line function

-' 

-'	generates intel-HEX file 

-'

-'	command line SaveHex output-file range1 [range2] [range3] .....

-'	range description:

-'		&lt;startaddress&gt;,&lt;length&gt; 

-'_______________________________________________________

-

-Sub SaveHEX(File,ParameterObj)

-

-	set debugger = workspace.Coredebugger(0)

-	set DisASMObj = debugger.DisASMObj

-	If Not IsObject(ParameterObj) Then

-	  	MsgBox "Number of parameters wrong"

-		Exit Sub 		

-	End If

-	If IsNumeric(File) Then

-	  	MsgBox "File parameter wrong - " &amp; File

-		Exit Sub 		

-	End If

-	DisASMObj.OutputPath = CStr(File)

-	bRetVal = DisASMObj.CreateStream(True,"UDE generated intel-Hex file of current Program",False)

-	If bRetVal = True Then

-		ParmeterCnt = ParameterObj.ParameterCount

-		If ParmeterCnt = 0 Then

-	  		MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-			Exit Sub 		

-		End If

-		If ( ParmeterCnt Mod 2 ) &lt;&gt; 0 Then

-	  		MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-			Exit Sub 		

-		End If

-		RangeCnt = ParmeterCnt/2

-		ParamIndex = 0

-		For Range = 0 To RangeCnt -1 

-			Address = CLng(ParameterObj.Parameter(ParamIndex))		

-			Length = CLng(ParameterObj.Parameter(ParamIndex +1))

-			ParamIndex = ParamIndex +2

- 			DisASMObj.AddRange Address,Length,0

-		Next

-		DisASMObj.HexFileModeFlag = True

-		DisASMObj.WriteAllRanges(False)

-	End If

-

-End Sub

-

-'_______________________________________________________

-'

-'	FillByte command line function

-' 

-'	fills memory range with byte pattern 

-'

-'	command line FillByte range1,pattern1 [range2,pattern2] [range3,pattern3] .....

-'	range description:

-'		&lt;startaddress&gt;,&lt;length&gt; 

-'_______________________________________________________

-

-Sub FillByte(ParameterObj)

-

-	set debugger = workspace.Coredebugger(0)

-	set DisASMObj = debugger.DisASMObj

-	If Not IsObject(ParameterObj) Then

-	  	MsgBox "Number of parameters wrong"

-		Exit Sub 		

-	End If

-	ParmeterCnt = ParameterObj.ParameterCount

-	If ParmeterCnt = 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	If ( ParmeterCnt Mod 3 ) &lt;&gt; 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	RangeCnt = ParmeterCnt/3

-	ParamIndex = 0

-	set udearrayobj = debugger.ByteArrayObj(1)

-	For Range = 0 To RangeCnt -1 

-		Address = CLng(ParameterObj.Parameter(ParamIndex))		

-		Length = CLng(ParameterObj.Parameter(ParamIndex +1))

-		Pattern = CLng(ParameterObj.Parameter(ParamIndex +2))

-		ParamIndex = ParamIndex +3

-		udearrayobj.Resize(Length)

-		udearrayobj.Fill(Pattern)

-		debugger.Write Address,udearrayobj

-	Next

-

-End Sub

-

-'_______________________________________________________

-'

-'	FillWord command line function

-' 

-'	fills memory range with word pattern 

-'

-'	command line FillWord range1,pattern1 [range2,pattern2] [range3,pattern3] .....

-'	range description:

-'		&lt;startaddress&gt;,&lt;length&gt; 

-'_______________________________________________________

-

-Sub FillWord(ParameterObj)

-

-	set debugger = workspace.Coredebugger(0)

-	set DisASMObj = debugger.DisASMObj

-	If Not IsObject(ParameterObj) Then

-	  	MsgBox "Number of parameters wrong"

-		Exit Sub 		

-	End If

-	ParmeterCnt = ParameterObj.ParameterCount

-	If ParmeterCnt = 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	If ( ParmeterCnt Mod 3 ) &lt;&gt; 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	RangeCnt = ParmeterCnt/3

-	ParamIndex = 0

-	set udearrayobj = debugger.WordArrayObj(1)

-	For Range = 0 To RangeCnt -1 

-		Address = CLng(ParameterObj.Parameter(ParamIndex))		

-		Length = CLng(ParameterObj.Parameter(ParamIndex +1)/2)

-		Pattern = CLng(ParameterObj.Parameter(ParamIndex +2))

-		ParamIndex = ParamIndex +3

-		udearrayobj.Resize(Length)

-		udearrayobj.Fill(Pattern)

-		debugger.Write Address,udearrayobj

-	Next

-

-End Sub

-

-'_______________________________________________________

-'

-'	FillDWord command line function

-' 

-'	fills memory range with dword pattern 

-'

-'	command line FillDWord range1,pattern1 [range2,pattern2] [range3,pattern3] .....

-'	range description:

-'		&lt;startaddress&gt;,&lt;length&gt; 

-'_______________________________________________________

-

-Sub FillDWord(ParameterObj)

-

-	set debugger = workspace.Coredebugger(0)

-	set DisASMObj = debugger.DisASMObj

-	If Not IsObject(ParameterObj) Then

-	  	MsgBox "Number of parameters wrong"

-		Exit Sub 		

-	End If

-	ParmeterCnt = ParameterObj.ParameterCount

-	If ParmeterCnt = 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	If ( ParmeterCnt Mod 3 ) &lt;&gt; 0 Then

-	  	MsgBox "Number of parameters wrong " &amp; ParmeterCnt

-		Exit Sub 		

-	End If

-	RangeCnt = ParmeterCnt/3

-	ParamIndex = 0

-	set udearrayobj = debugger.DWordArrayObj(1)

-	For Range = 0 To RangeCnt -1 

-		Address = CLng(ParameterObj.Parameter(ParamIndex))		

-		Length = CLng(ParameterObj.Parameter(ParamIndex +1)/4)

-		Pattern = CLng(ParameterObj.Parameter(ParamIndex +2))

-		ParamIndex = ParamIndex +3

-		udearrayobj.Resize(Length)

-		udearrayobj.Fill(Pattern)

-		debugger.Write Address,udearrayobj

-	Next

-

-End Sub</ScriptSource><ScriptArchitecture type="int">63</ScriptArchitecture><ScriptEngine type="string">VBScript</ScriptEngine><MacroFileTime type="string">24.11.2006 14:43:20:000</MacroFileTime><ScriptFromStg type="flag">1</ScriptFromStg><LocalComputerName type="string">WS_CORE_DUO</LocalComputerName><ExternalScriptPath type="string"></ExternalScriptPath><NextNodeName type="string">Macro_14_06_13_14_48_10_0</NextNodeName><UnAss type="key"><GUIEntry type="key"><MenuID type="int">10</MenuID><MenuString type="string">Execute UnAss ..</MenuString><ToolTipString type="string">Macro UnAss</ToolTipString><MessageString type="string">Execute macro UnAss</MessageString><DebugFlag type="flag">0</DebugFlag></GUIEntry><FuncParameterCnt type="int">2</FuncParameterCnt><GUIEntryDescription type="string"></GUIEntryDescription></UnAss><SaveHEX type="key"><GUIEntry type="key"><MenuID type="int">10</MenuID><MenuString type="string">Execute SaveHEX ..</MenuString><ToolTipString type="string">Macro SaveHEX</ToolTipString><MessageString type="string">Execute macro SaveHEX</MessageString><DebugFlag type="flag">0</DebugFlag></GUIEntry><FuncParameterCnt type="int">2</FuncParameterCnt><GUIEntryDescription type="string"></GUIEntryDescription></SaveHEX><FillByte type="key"><GUIEntry type="key"><MenuID type="int">10</MenuID><MenuString type="string">Execute FillByte ..</MenuString><ToolTipString type="string">Macro FillByte</ToolTipString><MessageString type="string">Execute macro FillByte</MessageString><DebugFlag type="flag">0</DebugFlag></GUIEntry><FuncParameterCnt type="int">1</FuncParameterCnt><GUIEntryDescription type="string"></GUIEntryDescription></FillByte><FillWord type="key"><GUIEntry type="key"><MenuID type="int">10</MenuID><MenuString type="string">Execute FillWord ..</MenuString><ToolTipString type="string">Macro FillWord</ToolTipString><MessageString type="string">Execute macro FillWord</MessageString><DebugFlag type="flag">0</DebugFlag></GUIEntry><FuncParameterCnt type="int">1</FuncParameterCnt><GUIEntryDescription type="string"></GUIEntryDescription></FillWord><FillDWord type="key"><GUIEntry type="key"><MenuID type="int">10</MenuID><MenuString type="string">Execute FillDWord ..</MenuString><ToolTipString type="string">Macro FillDWord</ToolTipString><MessageString type="string">Execute macro FillDWord</MessageString><DebugFlag type="flag">0</DebugFlag></GUIEntry><FuncParameterCnt type="int">1</FuncParameterCnt><GUIEntryDescription type="string"></GUIEntryDescription></FillDWord><NoOfFunctions type="int">5</NoOfFunctions></Macro_14_06_13_14_33_25_0></MacroGuiEntries><LastSelectedMacro type="string"></LastSelectedMacro></UDE.Script></AddOns><MultiCoreRunControl type="key"><NoOfRunCtrlGroups type="int">0</NoOfRunCtrlGroups></MultiCoreRunControl><Core type="key"><ViewSrv type="key"><PowerPcCpuWin type="key"><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><OPEN_VIEW type="key"><FrameCreated type="string">21.11.2012 14:17:23:645</FrameCreated><ViewSrv type="key"/><NETFrameMode type="int">77827</NETFrameMode><NETFrameSaveIndex type="int">5</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW><SAVED_VIEW type="int">0</SAVED_VIEW></PowerPcCpuWin><StdUDESymbolExplWin type="key"><OPEN_VIEW type="key"><FrameCreated type="string">20.11.2012 16:19:48:344</FrameCreated><ViewSrv type="key"/><NETFrameMode type="int">77826</NETFrameMode><NETFrameSaveIndex type="int">4</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><SAVED_VIEW type="int">0</SAVED_VIEW></StdUDESymbolExplWin><StdUDEProgWin type="key"><OPEN_VIEW00 type="key"><FrameCreated type="string">21.11.2012 12:22:49:573</FrameCreated><ViewSrv type="key"/><SourceFile type="string">..\main.c</SourceFile><Placement type="string">1,0,0,353,1094</Placement><FrameMode type="int">0</FrameMode><FrameDockState type="flag">0</FrameDockState><FrameDockFloatState type="flag">1</FrameDockFloatState><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">3</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt><SourceFileInstFlag type="int">1</SourceFileInstFlag></OPEN_VIEW00><OPEN_VIEW01 type="key"><FrameCreated type="string">14.06.2013 14:25:28:960</FrameCreated><ViewSrv type="key"/><SourceFile type="string">..\..\..\os\hal\src\hal.c</SourceFile><Placement type="string">1,49,63,402,1157</Placement><FrameMode type="int">0</FrameMode><FrameDockState type="flag">0</FrameDockState><FrameDockFloatState type="flag">1</FrameDockFloatState><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">6</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW01><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><SAVED_VIEW00 type="int">0</SAVED_VIEW00><SAVED_VIEW01 type="int">2</SAVED_VIEW01><OPEN_VIEW02 type="key"><FrameCreated type="string">14.06.2013 14:27:53:872</FrameCreated><ViewSrv type="key"/><SourceFile type="string">..\..\..\os\hal\platforms\SPC5xx\SIUL_v1\pal_lld.c</SourceFile><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">8</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW02><SAVED_VIEW02 type="int">1</SAVED_VIEW02><OPEN_VIEW03 type="key"><FrameCreated type="string">21.11.2012 14:44:22:506</FrameCreated><ViewSrv type="key"/><SourceFile type="string">..\..\..\os\kernel\src\chsys.c</SourceFile><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">6</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW03><SAVED_VIEW03 type="int">3</SAVED_VIEW03></StdUDEProgWin><StdUDESFRView type="key"><SAVED_VIEW_OBJS type="int">1</SAVED_VIEW_OBJS><OPEN_VIEW00 type="key"><FrameCreated type="string">21.11.2012 14:14:46:537</FrameCreated><ViewSrv type="key"><SFRView type="key"><NumberOfBitFieldsPerRow type="bin" size="8">AwAAAA==</NumberOfBitFieldsPerRow><BitfieldValueMode type="bin" size="8">AQAAAA==</BitfieldValueMode><NameWidth type="bin" size="8">kAAAAA==</NameWidth><ValueWidth type="bin" size="8">YAAAAA==</ValueWidth><Bitfield1Width type="bin" size="8">TgAAAA==</Bitfield1Width><Value1Width type="bin" size="8">jQAAAA==</Value1Width><Bitfield2Width type="bin" size="8">TgAAAA==</Bitfield2Width><Value2Width type="bin" size="8">jQAAAA==</Value2Width><Bitfield3Width type="bin" size="8">TgAAAA==</Bitfield3Width><Value3Width type="bin" size="8">jgAAAA==</Value3Width><Bitfield4Width type="bin" size="8">AAAAAA==</Bitfield4Width><Value4Width type="bin" size="8">AAAAAA==</Value4Width><TopIndex type="bin" size="8">AAAAAA==</TopIndex><CaretIndex type="bin" size="8">AAAAAA==</CaretIndex></SFRView></ViewSrv><NETFrameMode type="int">77825</NETFrameMode><NETFrameSaveIndex type="int">2</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW00><SAVED_VIEW00 type="int">0</SAVED_VIEW00><OPEN_VIEW01 type="key"/></StdUDESFRView><StdUDELocalsWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS><OPEN_VIEW type="key"><FrameCreated type="string">21.11.2012 14:10:10:424</FrameCreated><ViewSrv type="key"><NameWidth type="int">538</NameWidth><AddressWidth type="int">0</AddressWidth><ValueWidth type="int">360</ValueWidth><Value2Width type="int">0</Value2Width><MinMaxWidth type="int">0</MinMaxWidth></ViewSrv><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">5</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW><SAVED_VIEW type="int">0</SAVED_VIEW></StdUDELocalsWin><StdUDEWatchWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDEWatchWin><StdUDESimIOWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDESimIOWin><StdUDEHtmlDocWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDEHtmlDocWin><StdUDEGraphWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDEGraphWin><StdUDETimeSampleGraphWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDETimeSampleGraphWin><UDEProfilingWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></UDEProfilingWin><StdUDEMemWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS><OPEN_VIEW00 type="key"><FrameCreated type="string">13.06.2013 16:10:26:035</FrameCreated><ViewSrv type="key"><AnimateQueue type="key"/></ViewSrv></OPEN_VIEW00></StdUDEMemWin><StdUDEIPTraceGraphWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></StdUDEIPTraceGraphWin><UDETraceCoverageWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></UDETraceCoverageWin><UDETraceProfilingWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS></UDETraceProfilingWin><UDEStackWin type="key"><SAVED_VIEW_OBJS type="int">0</SAVED_VIEW_OBJS><OPEN_VIEW type="key"><FrameCreated type="string">13.06.2013 16:20:21:757</FrameCreated><ViewSrv type="key"><_ExtentX type="bin" size="8">UEoAAA==</_ExtentX><_ExtentY type="bin" size="8">gysAAA==</_ExtentY><_StockProps type="bin" size="8">AAAAAA==</_StockProps><Columns type="bin" size="8">AgAAAA==</Columns><ColName00 type="bin" size="8">UABDAAAA</ColName00><TypeName00 type="bin" size="8">UABDAAAA</TypeName00><Format00 type="bin" size="8">AAAAAA==</Format00><Size00 type="bin" size="8">YAAAAA==</Size00><ColName01 type="bin" size="24">RgB1AG4AYwB0AGkAbwBuAAAA</ColName01><TypeName01 type="bin" size="24">RgB1AG4AYwB0AGkAbwBuAAAA</TypeName01><Format01 type="bin" size="8">AAAAAA==</Format01><Size01 type="bin" size="8">QAYAAA==</Size01></ViewSrv><NETFrameMode type="int">73728</NETFrameMode><NETFrameSaveIndex type="int">9</NETFrameSaveIndex><FrameUserTitle type="string"></FrameUserTitle><CommonVisibilityGroup type="flag">0</CommonVisibilityGroup><VisibilityGroup_1 type="string">Target0.Controller0.Core</VisibilityGroup_1><VisibilityGroupsCnt type="int">1</VisibilityGroupsCnt></OPEN_VIEW></UDEStackWin></ViewSrv><UDE.StdDbgSrv type="key"><INI_SECTION type="key"><System type="key"><MIXEDMODE type="string">OFF</MIXEDMODE></System></INI_SECTION><UDE.PowerPcArchSrv type="key"><UDE.PpcJtagTargIntf type="key"><NewWorkspace type="flag">0</NewWorkspace></UDE.PpcJtagTargIntf></UDE.PowerPcArchSrv><UDE.UDESymbol type="key"><DefaultBinFileDir type="string">..\build</DefaultBinFileDir><BinFileDialogParam type="key"><Filter type="int">1</Filter></BinFileDialogParam><BinaryFiles type="key"><Number type="int">1</Number><BinaryFile1 type="key"><FullPath type="string">..\build\ch.elf</FullPath><SourceAliases type="key"><FullPath1 type="string">&lt;Section&gt;</FullPath1><EntryInFile1 type="string">C:\ChibiStudio\chibios\os\kernel\src\chevents.c</EntryInFile1><Number type="int">1</Number></SourceAliases><Breakpoints type="key"><Breakpoint1 type="string">Software;enabled;0;disabled;'main {C:\ChibiStudio\chibios\demos\PPC-SPC560D-GCC\main.c} .164';main.c;1;0;;$disabled; ;disabled; ;</Breakpoint1><Number type="int">1</Number></Breakpoints></BinaryFile1><BinaryFile-1 type="key"/></BinaryFiles><MultiCoreLoader type="key"><Number type="int">0</Number></MultiCoreLoader><ExpressionClipboard type="key"><Number type="int">0</Number></ExpressionClipboard></UDE.UDESymbol><STG_ADDON_PROF type="key"><UDE_Graphwin_Trace_AddOn type="key" name="UDE Graphwin Trace AddOn"><LOAD_STATE type="flag">1</LOAD_STATE></UDE_Graphwin_Trace_AddOn><UDELicense_Server type="key" name="UDELicense Server"><LOAD_STATE type="flag">1</LOAD_STATE></UDELicense_Server><UDEMemtool type="key"><LOAD_STATE type="flag">1</LOAD_STATE><FlashMod_PFLASH type="key"><Enabled type="flag">1</Enabled></FlashMod_PFLASH><FlashMod_DFLASH type="key"/><FlashMod_SHADOWFLASH type="key"/><Frontend type="key"><LastModule type="int">0</LastModule><VerifyProt type="flag">0</VerifyProt><VerifyProtFile type="string">verify.txt</VerifyProtFile><VerifyOnExit type="flag">0</VerifyOnExit><StoreLoadedSections type="flag">0</StoreLoadedSections><AutoStartProgAfterDownload type="flag">0</AutoStartProgAfterDownload><AutoCloseExecCmdDialog type="flag">0</AutoCloseExecCmdDialog><AllowOverwrite type="flag">0</AllowOverwrite></Frontend></UDEMemtool><ADD_ON_DEL_FLAG type="flag">0</ADD_ON_DEL_FLAG></STG_ADDON_PROF><CommQueueHndlStg type="key"><Beep type="flag">0</Beep><Retry type="flag">0</Retry><RetryPeriod type="int">0</RetryPeriod></CommQueueHndlStg><TargetStateHndlStg type="key"/></UDE.StdDbgSrv><MRUSourceFileList type="key"><NoOfMRUSrcFileEntries type="int">4</NoOfMRUSrcFileEntries><MRUSrcFile0 type="string">..\..\..\..\os\ports\GCC\PPC\chcore.c</MRUSrcFile0><MRUSrcFile1 type="string">..\..\..\..\os\kernel\src\chsys.c</MRUSrcFile1><MRUSrcFile2 type="string">..\..\..\..\os\hal\platforms\SPC5xx\DSPI_v1\spi_lld.c</MRUSrcFile2><MRUSrcFile3 type="string">..\main.c</MRUSrcFile3></MRUSourceFileList></Core><TargetInfoFile type="string">stm_xpc560b_spc560d40_minimodule_debug_jtag.cfg</TargetInfoFile><LastWriteDate type="string">14.06.2013 14:48:09:999</LastWriteDate></stg>

diff --git a/testhal/SPC560Dxx/SPI/UDE/stm_xpc560b_spc560d40_minimodule_debug_jtag.cfg b/testhal/SPC560Dxx/SPI/UDE/stm_xpc560b_spc560d40_minimodule_debug_jtag.cfg
deleted file mode 100644
index ca4a75aa0..000000000
--- a/testhal/SPC560Dxx/SPI/UDE/stm_xpc560b_spc560d40_minimodule_debug_jtag.cfg
+++ /dev/null
@@ -1,160 +0,0 @@
-[Main]

-Signature=UDE_TARGINFO_2.0

-Description=STM XPC560B Mini Module with SPC560D40 (Jtag)

-Description1=PLL set for 48MHz

-Description2=FLASH programming prepared but not enabled

-Description3=Write Filter for BAM Module

-MCUs=Controller0

-Architecture=PowerPC

-Vendor=STM

-Board=XPC560B Mini Module

-

-[Controller0]

-Family=PowerPC

-Type=SPC560D40

-Enabled=1

-IntClock=48000

-MemDevs=BAMWriteFilter

-ExtClock=8000

-

-[Controller0.Core]

-Protocol=PPCJTAG

-Enabled=1

-

-[Controller0.Core.LoadedAddOn]

-UDEMemtool=1

-

-[Controller0.Core.PpcJtagTargIntf]

-PortType=FTDI

-ResetWaitTime=50

-MaxJtagClk=2500

-DoSramInit=1

-UseNexus=1

-AdaptiveJtagPhaseShift=1

-ConnOption=Default

-ChangeJtagClk=10000

-HaltAfterReset=1

-SimioAddr=g_JtagSimioAccess

-FreezeTimers=1

-InvalidTlbOnReset=0

-InvalidateCache=0

-ForceCacheFlush=0

-IgnoreLockedLines=0

-ExecInitCmds=1

-JtagTapNumber=0

-JtagNumOfTaps=1

-JtagNumIrBefore=0

-JtagNumIrAfter=0

-

-SimioAddr=g_JtagSimioAccess

-

-FlushCache=0

-AllowMmuSetup=1

-UseExtReset=1

-HandleWdtBug=0

-ForceEndOfReset=0

-JtagViaPod=0

-AllowResetOnCheck=0

-ChangeMsr=0

-ChangeMsrValue=0x0

-ExecOnStartCmds=0

-ExecOnHaltCmds=0

-TargetPort=Default

-EnableProgramTimeMeasurement=0

-UseHwResetMode=0

-HandleNexusAccessBug=0

-DoNotEnableTrapSwBrp=0

-CommDevSel=PortType=USB,Type=FTDI

-BootPasswd0=0xFEEDFACE

-BootPasswd1=0xCAFEBEEF

-BootPasswd2=0xFFFFFFFF

-BootPasswd3=0xFFFFFFFF

-BootPasswd4=0xFFFFFFFF

-BootPasswd5=0xFFFFFFFF

-BootPasswd6=0xFFFFFFFF

-BootPasswd7=0xFFFFFFFF

-JtagIoType=Jtag

-ExecOnHaltCmdsWhileHalted=0

-TimerForPTM=Default

-AllowBreakOnUpdateBreakpoints=0

-ClearDebugStatusOnHalt=1

-HwResetMode=Simulate

-UseMasterNexusIfResetState=1

-UseLocalAddressTranslation=1

-Use64BitNexus=0

-InitSramOnlyWhenNotInitialized=0

-AllowHarrForUpdateDebugRegs=0

-DisableE2EECC=0

-UseCore0ForNexusMemoryAccessWhileRunning=0

-

-[Controller0.Core.PpcJtagTargIntf.InitScript]

-// setup IVOPR

-// points to internal memory at 0x40000000

-SETSPR 0x3F 0x40000000 0xFFFFFFFF

-

-// disable watchdog

-SET SWT_SR 0xC520

-SET SWT_SR 0xD928

-SET SWT_CR 0xFF00000A

-

-// Oscillator select

-SET CGM_OCDS_SC 0x1000000

-SET CGM_OC_EN 0x1

-

-// enable all modes

-SET ME_MER 0x5FF

-

-// run mode

-SET ME_DRUN_MC 0x1F0032

-SET ME_RUN_PC0 0xFE

-

-// enable peripherals in run and low power modes

-SET ME_LP_PC0 0x500

-

-// enable clocks

-SET8 CGM_SC_DC0 0x80

-SET8 CGM_SC_DC1 0x80

-SET8 CGM_SC_DC2 0x80

-

-// setup clock monitor

-SET CMU_CSR 0x6

-SET CMU_LFREFR 0x1

-SET CMU_HFREFR 0xFFE

-

-// Make DRUN configuration active

-SET ME_MCTL 0x30005AF0

-SET ME_MCTL 0x3000A50F

-WAIT 0x5

-

-// setup pll to 48MHz

-SET FMPLL_CR 0x5300041 0xFFFFFFFF

-// run mode

-SET ME_DRUN_MC 0x1F00F4

-

-// Make DRUN configuration active

-SET ME_MCTL 0x30005AF0

-SET ME_MCTL 0x3000A50F

-WAIT 0x5

-

-// setup SSCM erro cfg for debug

-SET16 SSCM_ERROR 0x3 0x3

-

-[Controller0.BAMWriteFilter]

-Description=BAM WriteAccess Filter

-Range0Start=0xFFFFC000

-Range0Size=0x4000

-Enabled=1

-Handler=AccessFilter

-Mode=ReadOnly

-

-[Controller0.PFLASH]

-Enabled=1

-EnableMemtoolByDefault=1

-

-[Controller0.DFLASH]

-Enabled=1

-EnableMemtoolByDefault=1

-

-[Controller0.Core.PpcJtagTargIntf.OnStartScript]

-

-[Controller0.Core.PpcJtagTargIntf.OnHaltScript]

diff --git a/testhal/SPC560Dxx/SPI/chconf.h b/testhal/SPC560Dxx/SPI/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC560Dxx/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Dxx/SPI/main.c b/testhal/SPC560Dxx/SPI/main.c
deleted file mode 100644
index f6aa96abe..000000000
--- a/testhal/SPC560Dxx/SPI/main.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Maximum speed SPI configuration.

- */

-static const SPIConfig hs_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV2 | SPC5_CTAR_ASC_DIV2 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV2,                       /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(1)                           /* PUSHR.   */

-};

-

-/*

- * Low speed SPI configuration.

- */

-static const SPIConfig ls_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV64 | SPC5_CTAR_ASC_DIV64 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV256,                     /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(0)                           /* PUSHR.   */

-};

-

-/*

- * SPI TX and RX buffers.

- */

-static uint8_t txbuf[512];

-static uint8_t rxbuf[512];

-

-/*

- * SPI bus contender 1.

- */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 1");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palClearPad(PORT_E, PE_LED1);       /* LED ON.                          */

-    spiStart(&SPID1, &hs_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * SPI bus contender 2.

- */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 2");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palSetPad(PORT_E, PE_LED1);         /* LED OFF.                         */

-    spiStart(&SPID1, &ls_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepare transmit pattern.

-   */

-  for (i = 0; i < sizeof(txbuf); i++)

-    txbuf[i] = (uint8_t)i;

-

-  /* Starting driver for test, DSPI_1 I/O pins setup.*/

-  spiStart(&SPID1, &ls_spicfg);

-  SIU.PCR[14].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SCK    */

-  SIU.PCR[13].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SOUT   */

-  SIU.PCR[15].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* CS[0] */

-  SIU.PCR[28].R = PAL_MODE_OUTPUT_ALTERNATE(3);     /* CS[1] */

-

-  /* Testing sending and receiving at the same time.*/

-  spiExchange(&SPID1, 4, txbuf, rxbuf);

-  spiExchange(&SPID1, 32, txbuf, rxbuf);

-  spiExchange(&SPID1, 512, txbuf, rxbuf);

-

-  /* Testing clock pulses without data buffering.*/

-  spiIgnore(&SPID1, 4);

-  spiIgnore(&SPID1, 32);

-

-  /* Testing sending data ignoring incoming data.*/

-  spiSend(&SPID1, 4, txbuf);

-  spiSend(&SPID1, 32, txbuf);

-

-  /* Testing receiving data while sending idle bits (high level).*/

-  spiReceive(&SPID1, 4, rxbuf);

-  spiReceive(&SPID1, 32, rxbuf);

-

-  /* Testing stop procedure.*/

-  spiStop(&SPID1);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),

-                    NORMALPRIO + 1, spi_thread_1, NULL);

-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),

-                    NORMALPRIO + 1, spi_thread_2, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-    palTogglePad(PORT_E, PE_LED2);

-  }

-  return 0;

-}

diff --git a/testhal/SPC560Dxx/SPI/mcuconf.h b/testhal/SPC560Dxx/SPI/mcuconf.h
deleted file mode 100644
index 6854e3056..000000000
--- a/testhal/SPC560Dxx/SPI/mcuconf.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC560B/Cxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC560Dxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               1

-#define SPC5_FMPLL0_NDIV_VALUE              48

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV8

-#define SPC5_XOSCDIV_VALUE                  1

-#define SPC5_IRCDIV_VALUE                   1

-#define SPC5_PERIPHERAL1_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL2_CLK_DIV_VALUE      2

-#define SPC5_PERIPHERAL3_CLK_DIV_VALUE      2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0 |             \

-                                             SPC5_ME_ME_STANDBY0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STANDBY0_MC_BITS            (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC0_BITS                0

-#define SPC5_ME_RUN_PC1_BITS                (SPC5_ME_RUN_PC_TEST |          \

-                                             SPC5_ME_RUN_PC_SAFE |          \

-                                             SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC2_BITS                (SPC5_ME_RUN_PC_DRUN |          \

-                                             SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC0_BITS                 0

-#define SPC5_ME_LP_PC1_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0 |          \

-                                             SPC5_ME_LP_PC_STANDBY0)

-#define SPC5_ME_LP_PC2_BITS                 (SPC5_ME_LP_PC_HALT0)

-#define SPC5_ME_LP_PC3_BITS                 (SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                0

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_USE_LINFLEX2            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX2_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX2_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX2_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI0                  TRUE

-#define SPC5_SPI_USE_DSPI1                  TRUE

-#define SPC5_SPI_DSPI0_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI0_TX1_DMA_CH_ID        4

-#define SPC5_SPI_DSPI0_TX2_DMA_CH_ID        5

-#define SPC5_SPI_DSPI0_RX_DMA_CH_ID         6

-#define SPC5_SPI_DSPI1_TX1_DMA_CH_ID        7

-#define SPC5_SPI_DSPI1_TX2_DMA_CH_ID        8

-#define SPC5_SPI_DSPI1_RX_DMA_CH_ID         9

-#define SPC5_SPI_DSPI0_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI0_IRQ_PRIO             10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

-#define SPC5_SPI_DSPI0_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI0_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI1_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI1_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560Dxx/SPI/readme.txt b/testhal/SPC560Dxx/SPI/readme.txt
deleted file mode 100644
index baa32f272..000000000
--- a/testhal/SPC560Dxx/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SPI driver demo for SPC560Dxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560Dxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560Dxx SPI driver.

-

-** Board Setup **

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC560Pxx/CAN/Makefile b/testhal/SPC560Pxx/CAN/Makefile
deleted file mode 100644
index 33ab47686..000000000
--- a/testhal/SPC560Pxx/CAN/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS   = -DSPC560P50L5

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS  =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS   =

-

-#

-# End of default section

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc560pxx_1.0.0.201302201417/component/lib/rsc/rules.mk

diff --git a/testhal/SPC560Pxx/CAN/chconf.h b/testhal/SPC560Pxx/CAN/chconf.h
deleted file mode 100644
index 8800269d4..000000000
--- a/testhal/SPC560Pxx/CAN/chconf.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/CAN/halconf.h b/testhal/SPC560Pxx/CAN/halconf.h
deleted file mode 100644
index c316bb385..000000000
--- a/testhal/SPC560Pxx/CAN/halconf.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 TRUE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL               TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/CAN/main.c b/testhal/SPC560Pxx/CAN/main.c
deleted file mode 100644
index b60729765..000000000
--- a/testhal/SPC560Pxx/CAN/main.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND1, PD_LED1};

-

-/*

- * Internal loopback mode, 500kBaud.

- * See chapter 25 on the SPC5 reference manual.

- */

-static const CANConfig cancfg = {

-  CAN_MCR_WRN_EN,

-  CAN_CTRL_LPB | CAN_CTRL_PROPSEG(2) | CAN_CTRL_PSEG2(7) |

-  CAN_CTRL_PSEG1(3) | CAN_CTRL_PRESDIV(3)

-#if SPC5_CAN_USE_FILTERS

-  ,

-  {

-   {0, 0x00000001},

-   {1, 0x01234567},

-   {0, 0x00000000},

-   {0, 0x00000003},

-   {0, 0x00000004},

-   {0, 0x00000005},

-   {0, 0x00000006},

-   {0, 0x00000007}

-  }

-#endif

-};

-

-#if SPC5_CAN_USE_FILTERS

-flagsmask_t rxFlag;

-#endif

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-#if SPC5_CAN_USE_FILTERS

-  rxFlag = chEvtGetAndClearFlagsI(&el);

-#endif

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-#if !SPC5_CAN_USE_FILTERS

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_D, cip->led);

-    }

-#else

-    while (canReceive(cip->canp, rxFlag,

-                       &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_D, cip->led);

-    }

-#endif

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.LENGTH = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, 1, &txmsg, MS2ST(100));

-    palTogglePad(PORT_D, PD_LED2);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN driver 1.

-   */

-  canStart(&CAND1, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx_wa, sizeof(can_rx_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

diff --git a/testhal/SPC560Pxx/CAN/mcuconf.h b/testhal/SPC560Pxx/CAN/mcuconf.h
deleted file mode 100644
index 4d18be947..000000000
--- a/testhal/SPC560Pxx/CAN/mcuconf.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*

- * Licensed under ST Liberty SW License Agreement V2, (the "License");

- * You may not use this file except in compliance with the License.

- * You may obtain a copy of the License at:

- *

- *        http://www.st.com/software_license_agreement_liberty_v2

- *

- * Unless required by applicable law or agreed to in writing, software 

- * distributed under the License is distributed on an "AS IS" BASIS, 

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-/*

- * SPC560Pxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC560Pxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_MCONTROL_DIVIDER_VALUE         2

-#define SPC5_FMPLL1_CLK_DIVIDER_VALUE       2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_SP_CLK_DIVIDER_VALUE           2

-#define SPC5_AUX3CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FR_CLK_DIVIDER_VALUE           2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  TRUE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * CAN driver system settings.

- */

-#define SPC5_CAN_USE_FILTERS                TRUE

-

-#define SPC5_CAN_USE_FLEXCAN0               TRUE

-#define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560Pxx/CAN/readme.txt b/testhal/SPC560Pxx/CAN/readme.txt
deleted file mode 100644
index b5587dd29..000000000
--- a/testhal/SPC560Pxx/CAN/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - CAN drivers demo for SPC560Pxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560Pxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560Pxx CAN drivers.

-

-** Board Setup **

-

-- Enable LED1 and LED2.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC560Pxx/PWM-ICU/.project b/testhal/SPC560Pxx/PWM-ICU/.project
deleted file mode 100644
index 4c2d806c5..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC560Pxx-PWM-ICU</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC560P</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC560Pxx/PWM-ICU/Makefile b/testhal/SPC560Pxx/PWM-ICU/Makefile
deleted file mode 100644
index 1bdaed928..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC560P/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC560Pxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Pxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC560P50.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -D_SPC560P50L5_

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC560Pxx/PWM-ICU/chconf.h b/testhal/SPC560Pxx/PWM-ICU/chconf.h
deleted file mode 100644
index c132ac014..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/PWM-ICU/halconf.h b/testhal/SPC560Pxx/PWM-ICU/halconf.h
deleted file mode 100644
index 09022b9e7..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL               TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/PWM-ICU/main.c b/testhal/SPC560Pxx/PWM-ICU/main.c
deleted file mode 100644
index 31ef444ee..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/main.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwmpcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(PORT_D, PD_LED1);

-}

-

-static void pwmc1cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(PORT_D, PD_LED1);

-}

-

-static PWMConfig pwmcfg = {

-  250000,                                   /* 250kHz PWM clock frequency.*/

-  50000,                                    /* Initial PWM period 0.2s.*/

-  pwmpcb,

-  {

-   {PWM_OUTPUT_ACTIVE_HIGH, pwmc1cb},

-   {PWM_OUTPUT_DISABLED, NULL}

-  },

-  PWM_ALIGN_EDGE

-};

-

-icucnt_t last_width, last_period;

-

-static void icuwidthcb(ICUDriver *icup) {

-

-  palSetPad(PORT_D, PD_LED2);

-  last_width = icuGetWidth(icup);

-}

-

-static void icuperiodcb(ICUDriver *icup) {

-

-  palClearPad(PORT_D, PD_LED2);

-  last_period = icuGetPeriod(icup);

-}

-

-static ICUConfig icucfg = {

-  ICU_INPUT_ACTIVE_HIGH,

-  250000,                                    /* 250kHz ICU clock frequency.*/

-  icuwidthcb,

-  icuperiodcb,

-  NULL

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes the PWM driver 1 and ICU driver 1.

-   * GPIOD10 is the PWM output.

-   * GPIOA0 is the ICU input.

-   * The two pins have to be externally connected together.

-   */

-  icuStart(&ICUD1, &icucfg);

-  icuEnable(&ICUD1);

-

-  /* Sets A0 alternative function.*/

-  SIU.PCR[0].R = 0b0100010100000100;

-

-  pwmStart(&PWMD1, &pwmcfg);

-  /* Sets D10 alternative function.*/

-  SIU.PCR[58].R = 0b0100010100000100;

-

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 0 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 25% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period and the PWM channel 0 to 50% duty cycle.

-   */

-  pwmChangePeriod(&PWMD1, 25000);

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables channel 0 and stops the drivers.

-   */

-  pwmDisableChannel(&PWMD1, 0);

-  pwmStop(&PWMD1);

-  icuDisable(&ICUD1);

-  icuStop(&ICUD1);

-  palClearPad(PORT_D, PD_LED3);

-  palClearPad(PORT_D, PD_LED4);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC560Pxx/PWM-ICU/mcuconf.h b/testhal/SPC560Pxx/PWM-ICU/mcuconf.h
deleted file mode 100644
index 1fb614e35..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/mcuconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC560Pxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC560Pxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL0

-#define SPC5_MCONTROL_DIVIDER_VALUE         2

-#define SPC5_FMPLL1_CLK_DIVIDER_VALUE       2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_SP_CLK_DIVIDER_VALUE           2

-#define SPC5_AUX3CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FR_CLK_DIVIDER_VALUE           2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                0

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            2

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * Serial driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  TRUE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU driver system settings.

- */

-#define SPC5_ICU_USE_SMOD0                  TRUE

-#define SPC5_ICU_USE_SMOD1                  FALSE

-#define SPC5_ICU_USE_SMOD2                  FALSE

-#define SPC5_ICU_USE_SMOD3                  FALSE

-#define SPC5_ICU_USE_SMOD4                  FALSE

-#define SPC5_ICU_USE_SMOD5                  FALSE

-#define SPC5_ICU_ETIMER0_PRIORITY           7

-#define SPC5_ICU_ETIMER0_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER0_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD6                  FALSE

-#define SPC5_ICU_USE_SMOD7                  FALSE

-#define SPC5_ICU_USE_SMOD8                  FALSE

-#define SPC5_ICU_USE_SMOD9                  FALSE

-#define SPC5_ICU_USE_SMOD10                 FALSE

-#define SPC5_ICU_USE_SMOD11                 FALSE

-#define SPC5_ICU_ETIMER1_PRIORITY           7

-#define SPC5_ICU_ETIMER1_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER1_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI0                  FALSE

-#define SPC5_SPI_USE_DSPI1                  FALSE

-#define SPC5_SPI_USE_DSPI2                  FALSE

-#define SPC5_SPI_USE_DSPI3                  FALSE

-#define SPC5_SPI_USE_DSPI4                  FALSE

-#define SPC5_SPI_DSPI0_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI3_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI4_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI0_TX1_DMA_CH_ID        4

-#define SPC5_SPI_DSPI0_TX2_DMA_CH_ID        5

-#define SPC5_SPI_DSPI0_RX_DMA_CH_ID         6

-#define SPC5_SPI_DSPI1_TX1_DMA_CH_ID        7

-#define SPC5_SPI_DSPI1_TX2_DMA_CH_ID        8

-#define SPC5_SPI_DSPI1_RX_DMA_CH_ID         9

-#define SPC5_SPI_DSPI2_TX1_DMA_CH_ID        10

-#define SPC5_SPI_DSPI2_TX2_DMA_CH_ID        11

-#define SPC5_SPI_DSPI2_RX_DMA_CH_ID         12

-#define SPC5_SPI_DSPI3_TX1_DMA_CH_ID        13

-#define SPC5_SPI_DSPI3_TX2_DMA_CH_ID        14

-#define SPC5_SPI_DSPI3_RX_DMA_CH_ID         15

-#define SPC5_SPI_DSPI4_TX1_DMA_CH_ID        1

-#define SPC5_SPI_DSPI4_TX2_DMA_CH_ID        2

-#define SPC5_SPI_DSPI4_RX_DMA_CH_ID         3

-#define SPC5_SPI_DSPI0_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI3_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI4_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI0_IRQ_PRIO             10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DSPI3_IRQ_PRIO             10

-#define SPC5_SPI_DSPI4_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

-#define SPC5_SPI_DSPI0_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI0_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI1_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI1_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI2_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI2_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI3_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI3_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI4_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI4_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560Pxx/PWM-ICU/readme.txt b/testhal/SPC560Pxx/PWM-ICU/readme.txt
deleted file mode 100644
index 025e73c87..000000000
--- a/testhal/SPC560Pxx/PWM-ICU/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - PWM/ICU drivers demo for SPC560Pxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560Pxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560Pxx PWM-ICU drivers.

-

-** Board Setup **

-

-- Connect D10 and A0 together.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC560Pxx/SPI/Makefile b/testhal/SPC560Pxx/SPI/Makefile
deleted file mode 100644
index c5e4bde95..000000000
--- a/testhal/SPC560Pxx/SPI/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC560P/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC560Pxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Pxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC560P50.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -D_SPC560P50L5_

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC560Pxx/SPI/chconf.h b/testhal/SPC560Pxx/SPI/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC560Pxx/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/SPI/halconf.h b/testhal/SPC560Pxx/SPI/halconf.h
deleted file mode 100644
index fdc079aef..000000000
--- a/testhal/SPC560Pxx/SPI/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC560Pxx/SPI/main.c b/testhal/SPC560Pxx/SPI/main.c
deleted file mode 100644
index 83ee0bbb1..000000000
--- a/testhal/SPC560Pxx/SPI/main.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Maximum speed SPI configuration.

- */

-static const SPIConfig hs_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV2 | SPC5_CTAR_ASC_DIV2 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV2,                       /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(1)                           /* PUSHR.   */

-};

-

-/*

- * Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first).

- */

-static const SPIConfig ls_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV64 | SPC5_CTAR_ASC_DIV64 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV256,                     /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(0)                           /* PUSHR.   */

-};

-

-/*

- * SPI TX and RX buffers.

- */

-static uint8_t txbuf[512];

-static uint8_t rxbuf[512];

-

-/*

- * SPI bus contender 1.

- */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 1");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palClearPad(PORT_D, PD_LED1);       /* LED ON.                          */

-    spiStart(&SPID1, &hs_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * SPI bus contender 2.

- */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 2");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palSetPad(PORT_D, PD_LED1);         /* LED OFF.                         */

-    spiStart(&SPID1, &ls_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepare transmit pattern.

-   */

-  for (i = 0; i < sizeof(txbuf); i++)

-    txbuf[i] = (uint8_t)i;

-

-  /* Starting driver for test, DSPI_1 I/O pins setup.*/

-  spiStart(&SPID1, &ls_spicfg);

-  SIU.PCR[37].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SCK    */

-  SIU.PCR[38].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SOUT   */

-  SIU.PCR[36].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* CS[0] */

-  SIU.PCR[35].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* CS[1] */

-

-  /* Testing sending and receiving at the same time.*/

-  spiExchange(&SPID1, 4, txbuf, rxbuf);

-  spiExchange(&SPID1, 32, txbuf, rxbuf);

-  spiExchange(&SPID1, 512, txbuf, rxbuf);

-

-  /* Testing clock pulses without data buffering.*/

-  spiIgnore(&SPID1, 4);

-  spiIgnore(&SPID1, 32);

-

-  /* Testing sending data ignoring incoming data.*/

-  spiSend(&SPID1, 4, txbuf);

-  spiSend(&SPID1, 32, txbuf);

-

-  /* Testing receiving data while sending idle bits (high level).*/

-  spiReceive(&SPID1, 4, rxbuf);

-  spiReceive(&SPID1, 32, rxbuf);

-

-  /* Testing stop procedure.*/

-  spiStop(&SPID1);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),

-                    NORMALPRIO + 1, spi_thread_1, NULL);

-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),

-                    NORMALPRIO + 1, spi_thread_2, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-    palTogglePad(PORT_D, PD_LED2);

-  }

-  return 0;

-}

diff --git a/testhal/SPC560Pxx/SPI/mcuconf.h b/testhal/SPC560Pxx/SPI/mcuconf.h
deleted file mode 100644
index 143134d4e..000000000
--- a/testhal/SPC560Pxx/SPI/mcuconf.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC560Pxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC560Pxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL0

-#define SPC5_MCONTROL_DIVIDER_VALUE         2

-#define SPC5_FMPLL1_CLK_DIVIDER_VALUE       2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_SP_CLK_DIVIDER_VALUE           2

-#define SPC5_AUX3CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FR_CLK_DIVIDER_VALUE           2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_TEST_MC_BITS                (SPC5_ME_MC_SYSCLK_IRC |        \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_CFLAON_NORMAL |     \

-                                             SPC5_ME_MC_DFLAON_NORMAL |     \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_PIT0_IRQ_PRIORITY              4

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                0

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * Serial driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  FALSE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU driver system settings.

- */

-#define SPC5_ICU_USE_SMOD0                  FALSE

-#define SPC5_ICU_USE_SMOD1                  FALSE

-#define SPC5_ICU_USE_SMOD2                  FALSE

-#define SPC5_ICU_USE_SMOD3                  FALSE

-#define SPC5_ICU_USE_SMOD4                  FALSE

-#define SPC5_ICU_USE_SMOD5                  FALSE

-#define SPC5_ICU_ETIMER0_PRIORITY           7

-#define SPC5_ICU_ETIMER0_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER0_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD6                  FALSE

-#define SPC5_ICU_USE_SMOD7                  FALSE

-#define SPC5_ICU_USE_SMOD8                  FALSE

-#define SPC5_ICU_USE_SMOD9                  FALSE

-#define SPC5_ICU_USE_SMOD10                 FALSE

-#define SPC5_ICU_USE_SMOD11                 FALSE

-#define SPC5_ICU_ETIMER1_PRIORITY           7

-#define SPC5_ICU_ETIMER1_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER1_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI0                  TRUE

-#define SPC5_SPI_USE_DSPI1                  TRUE

-#define SPC5_SPI_USE_DSPI2                  TRUE

-#define SPC5_SPI_USE_DSPI3                  TRUE

-#define SPC5_SPI_USE_DSPI4                  FALSE

-#define SPC5_SPI_DSPI0_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI3_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI4_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI0_TX1_DMA_CH_ID        4

-#define SPC5_SPI_DSPI0_TX2_DMA_CH_ID        5

-#define SPC5_SPI_DSPI0_RX_DMA_CH_ID         6

-#define SPC5_SPI_DSPI1_TX1_DMA_CH_ID        7

-#define SPC5_SPI_DSPI1_TX2_DMA_CH_ID        8

-#define SPC5_SPI_DSPI1_RX_DMA_CH_ID         9

-#define SPC5_SPI_DSPI2_TX1_DMA_CH_ID        10

-#define SPC5_SPI_DSPI2_TX2_DMA_CH_ID        11

-#define SPC5_SPI_DSPI2_RX_DMA_CH_ID         12

-#define SPC5_SPI_DSPI3_TX1_DMA_CH_ID        13

-#define SPC5_SPI_DSPI3_TX2_DMA_CH_ID        14

-#define SPC5_SPI_DSPI3_RX_DMA_CH_ID         15

-#define SPC5_SPI_DSPI4_TX1_DMA_CH_ID        1

-#define SPC5_SPI_DSPI4_TX2_DMA_CH_ID        2

-#define SPC5_SPI_DSPI4_RX_DMA_CH_ID         3

-#define SPC5_SPI_DSPI0_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI3_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI4_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI0_IRQ_PRIO             10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DSPI3_IRQ_PRIO             10

-#define SPC5_SPI_DSPI4_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

-#define SPC5_SPI_DSPI0_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI0_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI1_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI1_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI2_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI2_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI3_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI3_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI4_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI4_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC560Pxx/SPI/readme.txt b/testhal/SPC560Pxx/SPI/readme.txt
deleted file mode 100644
index 302b4a23b..000000000
--- a/testhal/SPC560Pxx/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SPI driver demo for SPC560Pxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC560Pxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC560Pxx SPI driver.

-

-** Board Setup **

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC563Mxx/ADC/Makefile b/testhal/SPC563Mxx/ADC/Makefile
deleted file mode 100644
index 644898587..000000000
--- a/testhal/SPC563Mxx/ADC/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC563M/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC563Mxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC563Mxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC563M64.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       adc_cfg.c main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC563Mxx/ADC/adc_cfg.c b/testhal/SPC563Mxx/ADC/adc_cfg.c
deleted file mode 100644
index 7bb5bbbe6..000000000
--- a/testhal/SPC563Mxx/ADC/adc_cfg.c
+++ /dev/null
@@ -1,743 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "adc_cfg.h"

-

-/*

- * ADC conversion group.

- * Mode:        Linear buffer, 8 samples of 5 channels, SW triggered.

- * Channels:    ADC_CHN_VRL, ADC_CHN_VREF25, ADC_CHN_VREF50,

- *              ADC_CHN_VREF75, ADC_CHN_VRH.

- *

- * NOTE: The configuration of a sequence is very complex in this ADC

- * implementation. Configurations are meant to be generated by the

- * SPC5 Studio visual configuration tool and not be written manually.

- * Writing complex sequences manually requires ad deep knowledge of both

- * the EQADC peripheral and the driver implementation.

- */

-static const adccommand_t adcgrpcfg1_commands[ADC_GRP1_NUM_CHANNELS *

-                                              ADC_GRP1_BUF_DEPTH] = {

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(0) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH)

-};

-

-const ADCConversionGroup adcgrpcfg1 = {

-  FALSE,

-  ADC_GRP1_NUM_CHANNELS,

-  NULL,

-  adcerrorcallback,

-  EQADC_CFCR_MODE_SWCS,

-  0, 0,                     /* ISEL, EISEL.*/

-  ADC_GRP1_BUF_DEPTH,

-  adcgrpcfg1_commands

-};

-

-/*

- * ADC conversion group.

- * Mode:        Circular buffer, 16 samples of 5 channels, SW triggered.

- * Channels:    ADC_CHN_VRL, ADC_CHN_VRL, ADC_CHN_VREF25, ADC_CHN_VREF50,

- *              ADC_CHN_VREF50, ADC_CHN_VREF75, ADC_CHN_VRH, ADC_CHN_VRH.

- *

- * NOTE: The configuration of a sequence is very complex in this ADC

- * implementation. Configurations are meant to be generated by the

- * SPC5 Studio visual configuration tool and not be written manually.

- * Writing complex sequences manually requires ad deep knowledge of both

- * the EQADC peripheral and the driver implementation.

- */

-static const adccommand_t adcgrpcfg2_commands[ADC_GRP2_NUM_CHANNELS *

-                                              ADC_GRP2_BUF_DEPTH] = {

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRL),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF25),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF50),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VREF75),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-

-  EQADC_CONV_BN_ADC0 | EQADC_CONV_LST_64 | EQADC_CONV_CAL |

-  EQADC_CONV_FMT_RJU | EQADC_CONV_CONFIG_STD | EQADC_CONV_MSG_RFIFO(2) |

-  EQADC_CONV_CHANNEL(ADC_CHN_VRH),

-};

-

-const ADCConversionGroup adcgrpcfg2 = {

-  TRUE,

-  ADC_GRP2_NUM_CHANNELS,

-  adccallback,

-  adcerrorcallback,

-  EQADC_CFCR_MODE_SWCS,

-  0, 0,                     /* ISEL, EISEL.*/

-  ADC_GRP2_BUF_DEPTH,

-  adcgrpcfg2_commands

-};

diff --git a/testhal/SPC563Mxx/ADC/adc_cfg.h b/testhal/SPC563Mxx/ADC/adc_cfg.h
deleted file mode 100644
index cf0f411a3..000000000
--- a/testhal/SPC563Mxx/ADC/adc_cfg.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#ifndef _ADC_CFG_H_

-#define _ADC_CFG_H_

-

-#define ADC_GRP1_NUM_CHANNELS   5

-#define ADC_GRP1_BUF_DEPTH      8

-

-#define ADC_GRP2_NUM_CHANNELS   8

-#define ADC_GRP2_BUF_DEPTH      16

-

-extern const ADCConversionGroup adcgrpcfg1;

-extern const ADCConversionGroup adcgrpcfg2;

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  void adccallback(ADCDriver *adcp, adcsample_t *buffer, size_t n);

-  void adcerrorcallback(ADCDriver *adcp, adcerror_t err);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _ADC_CFG_H_ */

diff --git a/testhal/SPC563Mxx/ADC/chconf.h b/testhal/SPC563Mxx/ADC/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC563Mxx/ADC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/ADC/halconf.h b/testhal/SPC563Mxx/ADC/halconf.h
deleted file mode 100644
index a719ec40a..000000000
--- a/testhal/SPC563Mxx/ADC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 TRUE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/ADC/main.c b/testhal/SPC563Mxx/ADC/main.c
deleted file mode 100644
index 6ec736309..000000000
--- a/testhal/SPC563Mxx/ADC/main.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "adc_cfg.h"

-

-static adcsample_t samples1[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH];

-static adcsample_t samples2[ADC_GRP2_NUM_CHANNELS * ADC_GRP2_BUF_DEPTH];

-

-/*

- * ADC streaming callback.

- */

-size_t nx = 0, ny = 0;

-void adccallback(ADCDriver *adcp, adcsample_t *buffer, size_t n) {

-

-  (void)adcp;

-  if (samples2 == buffer) {

-    nx += n;

-  }

-  else {

-    ny += n;

-  }

-}

-

-/*

- * ADC error callback.

- */

-void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {

-

-  (void)adcp;

-  (void)err;

-

-  palSetPad(PORT11, P11_LED4);

-  chSysHalt();

-}

-

-/*

- * LED blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palSetPad(PORT11, P11_LED1);

-    chThdSleepMilliseconds(500);

-    palClearPad(PORT11, P11_LED1);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Activates the ADC1, ADC3 drivers.

-   */

-  adcStart(&ADCD1, NULL);

-  adcStart(&ADCD3, NULL);

-

-  /*

-   * Linear conversion.

-   */

-  adcConvert(&ADCD1, &adcgrpcfg1, samples1, ADC_GRP1_BUF_DEPTH);

-  chThdSleepMilliseconds(1000);

-

-  /*

-   * Starts an ADC continuous conversion.

-   */

-  adcStartConversion(&ADCD3, &adcgrpcfg2, samples2, ADC_GRP2_BUF_DEPTH);

-

-  /*

-   * Normal main() thread activity, once the button is pressed the ADC

-   * conversion is stopped.

-   */

-  while (TRUE) {

-    if (palReadPad(PORT11, P11_BUTTON1)) {

-      adcStopConversion(&ADCD3);

-    }

-    chThdSleepMilliseconds(500);

-  }

-}

diff --git a/testhal/SPC563Mxx/ADC/mcuconf.h b/testhal/SPC563Mxx/ADC/mcuconf.h
deleted file mode 100644
index 2b9eab471..000000000
--- a/testhal/SPC563Mxx/ADC/mcuconf.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563Mxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC563Mxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  80

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV4

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-#define SPC5_EMIOS_GPRE_VALUE               20

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                (EDMA_CR_GRP3PRI(3) |           \

-                                             EDMA_CR_GRP2PRI(2) |           \

-                                             EDMA_CR_GRP1PRI(1) |           \

-                                             EDMA_CR_GRP0PRI(0) |           \

-                                             EDMA_CR_ERGA)

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_GROUP1_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                TRUE

-#define SPC5_ADC_USE_ADC0_Q1                TRUE

-#define SPC5_ADC_USE_ADC0_Q2                TRUE

-#define SPC5_ADC_USE_ADC1_Q3                TRUE

-#define SPC5_ADC_USE_ADC1_Q4                TRUE

-#define SPC5_ADC_USE_ADC1_Q5                TRUE

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      TRUE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI1                  FALSE

-#define SPC5_SPI_USE_DSPI2                  FALSE

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

diff --git a/testhal/SPC563Mxx/ADC/readme.txt b/testhal/SPC563Mxx/ADC/readme.txt
deleted file mode 100644
index ebe5c0a37..000000000
--- a/testhal/SPC563Mxx/ADC/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - ADC driver demo for SPC563Mxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC563Mxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC563Mxx ADC driver.

-

-** Board Setup **

-

-None.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC563Mxx/CAN/Makefile b/testhal/SPC563Mxx/CAN/Makefile
deleted file mode 100644
index 85eef1879..000000000
--- a/testhal/SPC563Mxx/CAN/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc563mxx_1.0.0.201305101230/component/lib/rsc/rules.mk

diff --git a/testhal/SPC563Mxx/CAN/chconf.h b/testhal/SPC563Mxx/CAN/chconf.h
deleted file mode 100644
index bebba272e..000000000
--- a/testhal/SPC563Mxx/CAN/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   FALSE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/CAN/halconf.h b/testhal/SPC563Mxx/CAN/halconf.h
deleted file mode 100644
index 4c7cb858d..000000000
--- a/testhal/SPC563Mxx/CAN/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 TRUE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/CAN/main.c b/testhal/SPC563Mxx/CAN/main.c
deleted file mode 100644
index b2fb5911b..000000000
--- a/testhal/SPC563Mxx/CAN/main.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND1, P11_LED1};

-

-/*

- * Internal loopback mode, 1MBaud.

- * See chapter 25 on the SPC5 reference manual.

- */

-static const CANConfig cancfg = {

-  CAN_MCR_WRN_EN,

-  CAN_CTRL_LPB | CAN_CTRL_PROPSEG(4) | CAN_CTRL_PSEG2(7) |

-  CAN_CTRL_PSEG1(5) | CAN_CTRL_PRESDIV(3)

-#if SPC5_CAN_USE_FILTERS

-  ,

-  {

-   {0, 0x00000001},

-   {1, 0x01234567},

-   {0, 0x00000000},

-   {0, 0x00000003},

-   {0, 0x00000004},

-   {0, 0x00000005},

-   {0, 0x00000006},

-   {0, 0x00000007}

-  }

-#endif

-};

-

-#if SPC5_CAN_USE_FILTERS

-flagsmask_t rxFlag;

-#endif

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-#if SPC5_CAN_USE_FILTERS

-  rxFlag = chEvtGetAndClearFlagsI(&el);

-#endif

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-#if !SPC5_CAN_USE_FILTERS

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT11, cip->led);

-    }

-#else

-    while (canReceive(cip->canp, rxFlag,

-                       &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT11, cip->led);

-    }

-#endif

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.LENGTH = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, 1, &txmsg, MS2ST(100));

-    palTogglePad(PORT11, P11_LED2);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN driver 1.

-   */

-  canStart(&CAND1, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx_wa, sizeof(can_rx_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC563Mxx/CAN/mcuconf.h b/testhal/SPC563Mxx/CAN/mcuconf.h
deleted file mode 100644
index 0fd5790a1..000000000
--- a/testhal/SPC563Mxx/CAN/mcuconf.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563Mxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC563Mxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  80

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV4

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_PRIO             12

-#define SPC5_ADC_FIFO1_DMA_PRIO             12

-#define SPC5_ADC_FIFO2_DMA_PRIO             12

-#define SPC5_ADC_FIFO3_DMA_PRIO             12

-#define SPC5_ADC_FIFO4_DMA_PRIO             12

-#define SPC5_ADC_FIFO5_DMA_PRIO             12

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      FALSE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * CAN driver system settings.

- */

-#define SPC5_CAN_USE_FILTERS                FALSE

-

-#define SPC5_CAN_USE_FLEXCAN0               TRUE

-#define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY      11

-

-#define SPC5_CAN_USE_FLEXCAN1               FALSE

-#define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY      11

diff --git a/testhal/SPC563Mxx/CAN/readme.txt b/testhal/SPC563Mxx/CAN/readme.txt
deleted file mode 100644
index edce4c68a..000000000
--- a/testhal/SPC563Mxx/CAN/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - CAN drivers demo for SPC563Mxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC563Mxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC563Mxx CAN drivers.

-

-** Board Setup **

-

-- Enable LED1 and LED2.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC563Mxx/ICU-PWM/.project b/testhal/SPC563Mxx/ICU-PWM/.project
deleted file mode 100644
index ad9c9d7b9..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC563Mxx-ICU-PWM</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC563M</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC563Mxx/ICU-PWM/Makefile b/testhal/SPC563Mxx/ICU-PWM/Makefile
deleted file mode 100644
index 911a39668..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC563M/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC563Mxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC563Mxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC563M64.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC563Mxx/ICU-PWM/chconf.h b/testhal/SPC563Mxx/ICU-PWM/chconf.h
deleted file mode 100644
index dcf9010cb..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   FALSE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/ICU-PWM/halconf.h b/testhal/SPC563Mxx/ICU-PWM/halconf.h
deleted file mode 100644
index 3a6d72910..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/ICU-PWM/main.c b/testhal/SPC563Mxx/ICU-PWM/main.c
deleted file mode 100644
index f8c9ec4c2..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/main.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwmpcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(PORT11, P11_LED1);

-}

-

-static void pwmc1cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(PORT11, P11_LED1);

-}

-

-static PWMConfig pwmcfg = {

-  100000,                                   /* 100kHz PWM clock frequency.*/

-  20000,                                    /* Initial PWM period 0.2s.*/

-  pwmpcb,

-  {

-   {PWM_OUTPUT_ACTIVE_HIGH, pwmc1cb}

-  },

-  PWM_ALIGN_EDGE

-};

-

-icucnt_t last_width, last_period;

-

-static void icuwidthcb(ICUDriver *icup) {

-

-  palSetPad(PORT11, P11_LED2);

-  last_width = icuGetWidth(icup);

-}

-

-static void icuperiodcb(ICUDriver *icup) {

-

-  palClearPad(PORT11, P11_LED2);

-  last_period = icuGetPeriod(icup);

-}

-

-static ICUConfig icucfg = {

-  ICU_INPUT_ACTIVE_HIGH,

-  100000,                                   /* 100kHz ICU clock frequency.*/

-  icuwidthcb,

-  icuperiodcb,

-  NULL

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /* Initialization of all the imported components in the order specified in

-	 the application wizard. The function is generated automatically.*/

-  componentsInit();

-

-  palClearPad(PORT11, P11_LED4);

-

-  /*

-   * Initializes the PWM driver 8 and ICU driver 1.

-   * PIN80 is the PWM output.

-   * PIN63 is the ICU input.

-   * The two pins have to be externally connected together.

-   */

-

-  /* Sets PIN63 alternative function.*/

-  SIU.PCR[179].R = 0b0000011000001100;

-

-  /* Sets PIN65 alternative function.*/

-  SIU.PCR[181].R = 0b0000010100001100;

-

-  icuStart(&ICUD2, &icucfg);

-  icuEnable(&ICUD2);

-  pwmStart(&PWMD1, &pwmcfg);

-

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 0 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 25% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period and the PWM channel 0 to 50% duty cycle.

-   */

-  pwmChangePeriod(&PWMD1, 25000);

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables PWM channel 0 and stops the drivers.

-   */

-  pwmDisableChannel(&PWMD1, 0);

-  pwmStop(&PWMD1);

-

-  /*

-   * Disables and stops the ICU drivers.

-   */

-

-  icuDisable(&ICUD2);

-  icuStop(&ICUD2);

-

-  palClearPad(PORT11, P11_LED3);

-  palClearPad(PORT11, P11_LED4);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC563Mxx/ICU-PWM/mcuconf.h b/testhal/SPC563Mxx/ICU-PWM/mcuconf.h
deleted file mode 100644
index a85edd579..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/mcuconf.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563Mxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC563Mxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  80

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV4

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-#define SPC5_EMIOS_GPRE_VALUE               200

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_PRIO             12

-#define SPC5_ADC_FIFO1_DMA_PRIO             12

-#define SPC5_ADC_FIFO2_DMA_PRIO             12

-#define SPC5_ADC_FIFO3_DMA_PRIO             12

-#define SPC5_ADC_FIFO4_DMA_PRIO             12

-#define SPC5_ADC_FIFO5_DMA_PRIO             12

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      FALSE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * ICU - PWM driver system settings.

- */

-#define SPC5_ICU_USE_EMIOS_CH1              TRUE

-#define SPC5_ICU_USE_EMIOS_CH2              TRUE

-#define SPC5_ICU_USE_EMIOS_CH3              TRUE

-#define SPC5_ICU_USE_EMIOS_CH4              TRUE

-#define SPC5_ICU_USE_EMIOS_CH5              TRUE

-#define SPC5_ICU_USE_EMIOS_CH6              TRUE

-#define SPC5_ICU_USE_EMIOS_CH11             TRUE

-#define SPC5_ICU_USE_EMIOS_CH13             TRUE

-

-#define SPC5_PWM_USE_EMIOS_CH0              TRUE

-#define SPC5_PWM_USE_EMIOS_CH8              TRUE

-#define SPC5_PWM_USE_EMIOS_CH9              TRUE

-#define SPC5_PWM_USE_EMIOS_CH10             TRUE

-#define SPC5_PWM_USE_EMIOS_CH12             TRUE

-#define SPC5_PWM_USE_EMIOS_CH14             TRUE

-#define SPC5_PWM_USE_EMIOS_CH15             TRUE

-#define SPC5_PWM_USE_EMIOS_CH23             TRUE

diff --git a/testhal/SPC563Mxx/ICU-PWM/readme.txt b/testhal/SPC563Mxx/ICU-PWM/readme.txt
deleted file mode 100644
index b65b14a65..000000000
--- a/testhal/SPC563Mxx/ICU-PWM/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - ICU_PWM driver demo for SPC563Mxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC563Mxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC563Mxx ICU and PWM drivers.

-

-** Board Setup **

-

-Connect PIN63 and PIN65 together.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC563Mxx/SPI/Makefile b/testhal/SPC563Mxx/SPI/Makefile
deleted file mode 100644
index 911a39668..000000000
--- a/testhal/SPC563Mxx/SPI/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC563M/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC563Mxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC563Mxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC563M64.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC563Mxx/SPI/chconf.h b/testhal/SPC563Mxx/SPI/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC563Mxx/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/SPI/halconf.h b/testhal/SPC563Mxx/SPI/halconf.h
deleted file mode 100644
index fdc079aef..000000000
--- a/testhal/SPC563Mxx/SPI/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC563Mxx/SPI/main.c b/testhal/SPC563Mxx/SPI/main.c
deleted file mode 100644
index 46378a5f8..000000000
--- a/testhal/SPC563Mxx/SPI/main.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Maximum speed SPI configuration.

- */

-static const SPIConfig hs_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV2 | SPC5_CTAR_ASC_DIV2 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV2,                       /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(1)                           /* PUSHR.   */

-};

-

-/*

- * Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first).

- */

-static const SPIConfig ls_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV64 | SPC5_CTAR_ASC_DIV64 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV256,                     /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(0)                           /* PUSHR.   */

-};

-

-/*

- * SPI TX and RX buffers.

- */

-static uint8_t txbuf[512];

-static uint8_t rxbuf[512];

-

-/*

- * SPI bus contender 1.

- */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 1");

-  while (TRUE) {

-    spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

-    palClearPad(PORT11, P11_LED1);      /* LED ON.                          */

-    spiStart(&SPID2, &hs_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID2);                  /* Slave Select assertion.          */

-    spiExchange(&SPID2, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID2);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID2);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * SPI bus contender 2.

- */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 2");

-  while (TRUE) {

-    spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

-    palSetPad(PORT11, P11_LED1);        /* LED OFF.                         */

-    spiStart(&SPID2, &ls_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID2);                  /* Slave Select assertion.          */

-    spiExchange(&SPID2, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID2);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID2);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepare transmit pattern.

-   */

-  for (i = 0; i < sizeof(txbuf); i++)

-    txbuf[i] = (uint8_t)i;

-

-  /* Starting driver for test, DSPI_B I/O pins setup.*/

-  spiStart(&SPID2, &ls_spicfg);

-  SIU.PCR[102].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SCK    */

-  SIU.PCR[103].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SIN    */

-  SIU.PCR[104].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SOUT   */

-  SIU.PCR[105].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* PCS[0] */

-  SIU.PCR[106].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* PCS[1] */

-

-  /* Testing sending and receiving at the same time.*/

-  spiExchange(&SPID2, 4, txbuf, rxbuf);

-  spiExchange(&SPID2, 32, txbuf, rxbuf);

-  spiExchange(&SPID2, 512, txbuf, rxbuf);

-

-  /* Testing clock pulses without data buffering.*/

-  spiIgnore(&SPID2, 4);

-  spiIgnore(&SPID2, 32);

-

-  /* Testing sending data ignoring incoming data.*/

-  spiSend(&SPID2, 4, txbuf);

-  spiSend(&SPID2, 32, txbuf);

-

-  /* Testing receiving data while sending idle bits (high level).*/

-  spiReceive(&SPID2, 4, rxbuf);

-  spiReceive(&SPID2, 32, rxbuf);

-

-  /* Testing stop procedure.*/

-  spiStop(&SPID2);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),

-                    NORMALPRIO + 1, spi_thread_1, NULL);

-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),

-                    NORMALPRIO + 1, spi_thread_2, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-    palTogglePad(PORT11, P11_LED2);

-  }

-  return 0;

-}

diff --git a/testhal/SPC563Mxx/SPI/mcuconf.h b/testhal/SPC563Mxx/SPI/mcuconf.h
deleted file mode 100644
index 364ad6aab..000000000
--- a/testhal/SPC563Mxx/SPI/mcuconf.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563Mxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC563Mxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  80

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV4

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-#define SPC5_EMIOS_GPRE_VALUE               20

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                (EDMA_CR_GRP3PRI(3) |           \

-                                             EDMA_CR_GRP2PRI(2) |           \

-                                             EDMA_CR_GRP1PRI(1) |           \

-                                             EDMA_CR_GRP0PRI(0) |           \

-                                             EDMA_CR_ERGA)

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_GROUP1_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      TRUE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI1                  TRUE

-#define SPC5_SPI_USE_DSPI2                  TRUE

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

diff --git a/testhal/SPC563Mxx/SPI/readme.txt b/testhal/SPC563Mxx/SPI/readme.txt
deleted file mode 100644
index 1e0b7fcc0..000000000
--- a/testhal/SPC563Mxx/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SPI driver demo for SPC563Mxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC563Mxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC563Mxx SPI driver.

-

-** Board Setup **

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC564Axx/CAN/Makefile b/testhal/SPC564Axx/CAN/Makefile
deleted file mode 100644
index bdd72d6ac..000000000
--- a/testhal/SPC564Axx/CAN/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc564axx_1.0.0.201305101230/component/lib/rsc/rules.mk

diff --git a/testhal/SPC564Axx/CAN/chconf.h b/testhal/SPC564Axx/CAN/chconf.h
deleted file mode 100644
index bebba272e..000000000
--- a/testhal/SPC564Axx/CAN/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   FALSE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/CAN/halconf.h b/testhal/SPC564Axx/CAN/halconf.h
deleted file mode 100644
index 4c7cb858d..000000000
--- a/testhal/SPC564Axx/CAN/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 TRUE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/CAN/main.c b/testhal/SPC564Axx/CAN/main.c
deleted file mode 100644
index 03a25dfe9..000000000
--- a/testhal/SPC564Axx/CAN/main.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND1, P11_LED1};

-

-/*

- * Internal loopback mode, 1MBaud.

- * See chapter 25 on the SPC5 reference manual.

- */

-static const CANConfig cancfg = {

-  CAN_MCR_WRN_EN,

-  CAN_CTRL_LPB | CAN_CTRL_PROPSEG(4) | CAN_CTRL_PSEG2(7) |

-  CAN_CTRL_PSEG1(5) | CAN_CTRL_PRESDIV(3)

-#if SPC5_CAN_USE_FILTERS

-  ,

-  {

-   {0, 0x00000001},

-   {1, 0x01234567},

-   {0, 0x00000000},

-   {0, 0x00000003},

-   {0, 0x00000004},

-   {0, 0x00000005},

-   {0, 0x00000006},

-   {0, 0x00000007}

-  }

-#endif

-};

-

-#if SPC5_CAN_USE_FILTERS

-flagsmask_t rxFlag;

-#endif

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-#if SPC5_CAN_USE_FILTERS

-  rxFlag = chEvtGetAndClearFlagsI(&el);

-#endif

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-#if !SPC5_CAN_USE_FILTERS

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT11, cip->led);

-    }

-#else

-    while (canReceive(cip->canp, rxFlag,

-                       &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT11, cip->led);

-    }

-#endif

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.LENGTH = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, 1, &txmsg, MS2ST(100));

-    palTogglePad(PORT11, P11_LED2);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-  /*

-   * Activates the CAN driver 1.

-   */

-  canStart(&CAND1, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx_wa, sizeof(can_rx_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC564Axx/CAN/mcuconf.h b/testhal/SPC564Axx/CAN/mcuconf.h
deleted file mode 100644
index 2bf1ca071..000000000
--- a/testhal/SPC564Axx/CAN/mcuconf.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC564Axx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC564Axx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  75

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV2

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_PRIO             12

-#define SPC5_ADC_FIFO1_DMA_PRIO             12

-#define SPC5_ADC_FIFO2_DMA_PRIO             12

-#define SPC5_ADC_FIFO3_DMA_PRIO             12

-#define SPC5_ADC_FIFO4_DMA_PRIO             12

-#define SPC5_ADC_FIFO5_DMA_PRIO             12

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      FALSE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * CAN driver system settings.

- */

-#define SPC5_CAN_USE_FILTERS                FALSE

-

-#define SPC5_CAN_USE_FLEXCAN0               TRUE

-#define SPC5_CAN_FLEXCAN0_PRIORITY          11

-

-#define SPC5_CAN_USE_FLEXCAN1               FALSE

-#define SPC5_CAN_FLEXCAN1_PRIORITY          11

-

-#define SPC5_CAN_USE_FLEXCAN2               FALSE

-#define SPC5_CAN_FLEXCAN2_PRIORITY          11

diff --git a/testhal/SPC564Axx/CAN/readme.txt b/testhal/SPC564Axx/CAN/readme.txt
deleted file mode 100644
index d196c1815..000000000
--- a/testhal/SPC564Axx/CAN/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - CAN drivers demo for SPC564Axx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC564Axx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC564Axx CAN drivers.

-

-** Board Setup **

-

-- Enable LED1 and LED2.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC564Axx/ICU-PWM/Makefile b/testhal/SPC564Axx/ICU-PWM/Makefile
deleted file mode 100644
index bdd72d6ac..000000000
--- a/testhal/SPC564Axx/ICU-PWM/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc564axx_1.0.0.201305101230/component/lib/rsc/rules.mk

diff --git a/testhal/SPC564Axx/ICU-PWM/chconf.h b/testhal/SPC564Axx/ICU-PWM/chconf.h
deleted file mode 100644
index dcf9010cb..000000000
--- a/testhal/SPC564Axx/ICU-PWM/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   FALSE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/ICU-PWM/halconf.h b/testhal/SPC564Axx/ICU-PWM/halconf.h
deleted file mode 100644
index 24462dafd..000000000
--- a/testhal/SPC564Axx/ICU-PWM/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/ICU-PWM/main.c b/testhal/SPC564Axx/ICU-PWM/main.c
deleted file mode 100644
index b41e4cfab..000000000
--- a/testhal/SPC564Axx/ICU-PWM/main.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwmpcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(PORT11, P11_LED1);

-}

-

-static void pwmc1cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(PORT11, P11_LED1);

-}

-

-static PWMConfig pwmcfg = {

-  187500,                                   /* 187500Hz PWM clock frequency.*/

-  19500,                                    /* Initial PWM period 0.1040s.*/

-  pwmpcb,

-  {

-   {PWM_OUTPUT_ACTIVE_HIGH, pwmc1cb}

-  },

-  PWM_ALIGN_EDGE

-};

-

-icucnt_t last_width, last_period;

-

-static void icuwidthcb(ICUDriver *icup) {

-

-  palSetPad(PORT11, P11_LED2);

-  last_width = icuGetWidth(icup);

-}

-

-static void icuperiodcb(ICUDriver *icup) {

-

-  palClearPad(PORT11, P11_LED2);

-  last_period = icuGetPeriod(icup);

-}

-

-static ICUConfig icucfg = {

-  ICU_INPUT_ACTIVE_HIGH,

-  187500,                                    /* 187500Hz ICU clock frequency.*/

-  icuwidthcb,

-  icuperiodcb,

-  NULL

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /* Initialization of all the imported components in the order specified in

-     the application wizard. The function is generated automatically.*/

-  componentsInit();

-

-  palClearPad(PORT11, P11_LED4);

-

-  /*

-   * Initializes the PWM driver 6 and ICU driver 3.

-   * PIN78 is the PWM output.

-   * PIN65 is the ICU input.

-   * The two pins have to be externally connected together.

-   */

-

-  /* Sets PIN63 alternative function.*/

-  SIU.PCR[179].R = 0b0000011000001100;

-

-  /* Sets PIN65 alternative function.*/

-  SIU.PCR[181].R = 0b0000010100001100;

-

-  icuStart(&ICUD2, &icucfg);

-  icuEnable(&ICUD2);

-  pwmStart(&PWMD1, &pwmcfg);

-

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 0 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 25% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period and the PWM channel 0 to 50% duty cycle.

-   */

-  pwmChangePeriod(&PWMD1, 25000);

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables PWM channel 0 and stops the drivers.

-   */

-  pwmDisableChannel(&PWMD1, 0);

-  pwmStop(&PWMD1);

-

-  /*

-   * Disables and stops the ICU drivers.

-   */

-

-  icuDisable(&ICUD2);

-  icuStop(&ICUD2);

-

-  palClearPad(PORT11, P11_LED3);

-  palClearPad(PORT11, P11_LED4);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC564Axx/ICU-PWM/mcuconf.h b/testhal/SPC564Axx/ICU-PWM/mcuconf.h
deleted file mode 100644
index ad4437b14..000000000
--- a/testhal/SPC564Axx/ICU-PWM/mcuconf.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC564Axx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC564Axx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  75

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV2

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-#define SPC5_EMIOS_GPRE_VALUE               200

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_PRIO             12

-#define SPC5_ADC_FIFO1_DMA_PRIO             12

-#define SPC5_ADC_FIFO2_DMA_PRIO             12

-#define SPC5_ADC_FIFO3_DMA_PRIO             12

-#define SPC5_ADC_FIFO4_DMA_PRIO             12

-#define SPC5_ADC_FIFO5_DMA_PRIO             12

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(5)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE,ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      FALSE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-

-/*

- * ICU - PWM driver system settings.

- */

-#define SPC5_ICU_USE_EMIOS_CH1              TRUE

-#define SPC5_ICU_USE_EMIOS_CH2              TRUE

-#define SPC5_ICU_USE_EMIOS_CH3              TRUE

-#define SPC5_ICU_USE_EMIOS_CH4              TRUE

-#define SPC5_ICU_USE_EMIOS_CH5              TRUE

-#define SPC5_ICU_USE_EMIOS_CH6              TRUE

-#define SPC5_ICU_USE_EMIOS_CH11             TRUE

-#define SPC5_ICU_USE_EMIOS_CH13             TRUE

-#define SPC5_ICU_USE_EMIOS_CH7              TRUE

-#define SPC5_ICU_USE_EMIOS_CH16             TRUE

-#define SPC5_ICU_USE_EMIOS_CH17             TRUE

-#define SPC5_ICU_USE_EMIOS_CH18             TRUE

-

-#define SPC5_PWM_USE_EMIOS_CH0              TRUE

-#define SPC5_PWM_USE_EMIOS_CH8              TRUE

-#define SPC5_PWM_USE_EMIOS_CH9              TRUE

-#define SPC5_PWM_USE_EMIOS_CH10             TRUE

-#define SPC5_PWM_USE_EMIOS_CH12             TRUE

-#define SPC5_PWM_USE_EMIOS_CH14             TRUE

-#define SPC5_PWM_USE_EMIOS_CH15             TRUE

-#define SPC5_PWM_USE_EMIOS_CH23             TRUE

-#define SPC5_PWM_USE_EMIOS_CH19             TRUE

-#define SPC5_PWM_USE_EMIOS_CH20             TRUE

-#define SPC5_PWM_USE_EMIOS_CH21             TRUE

-#define SPC5_PWM_USE_EMIOS_CH22             TRUE

diff --git a/testhal/SPC564Axx/ICU-PWM/readme.txt b/testhal/SPC564Axx/ICU-PWM/readme.txt
deleted file mode 100644
index b990c35d1..000000000
--- a/testhal/SPC564Axx/ICU-PWM/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - ICU-PWM driver demo for SPC564Axx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC564Axx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC564Axx ICU and PWM drivers.

-

-** Board Setup **

-

-Connect PIN65 and PIN65 together.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC564Axx/SPI/.project b/testhal/SPC564Axx/SPI/.project
deleted file mode 100644
index bb29d6206..000000000
--- a/testhal/SPC564Axx/SPI/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC564Axx-SPI</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC564A</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC564Axx/SPI/Makefile b/testhal/SPC564Axx/SPI/Makefile
deleted file mode 100644
index 200b9191d..000000000
--- a/testhal/SPC564Axx/SPI/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC564A/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC564Axx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC564Axx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC564A70.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -D_SPC564A70L7_

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC564Axx/SPI/chconf.h b/testhal/SPC564Axx/SPI/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC564Axx/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/SPI/halconf.h b/testhal/SPC564Axx/SPI/halconf.h
deleted file mode 100644
index fdc079aef..000000000
--- a/testhal/SPC564Axx/SPI/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC564Axx/SPI/main.c b/testhal/SPC564Axx/SPI/main.c
deleted file mode 100644
index 46378a5f8..000000000
--- a/testhal/SPC564Axx/SPI/main.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Maximum speed SPI configuration.

- */

-static const SPIConfig hs_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV2 | SPC5_CTAR_ASC_DIV2 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV2,                       /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(1)                           /* PUSHR.   */

-};

-

-/*

- * Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first).

- */

-static const SPIConfig ls_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV64 | SPC5_CTAR_ASC_DIV64 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV256,                     /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(0)                           /* PUSHR.   */

-};

-

-/*

- * SPI TX and RX buffers.

- */

-static uint8_t txbuf[512];

-static uint8_t rxbuf[512];

-

-/*

- * SPI bus contender 1.

- */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 1");

-  while (TRUE) {

-    spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

-    palClearPad(PORT11, P11_LED1);      /* LED ON.                          */

-    spiStart(&SPID2, &hs_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID2);                  /* Slave Select assertion.          */

-    spiExchange(&SPID2, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID2);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID2);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * SPI bus contender 2.

- */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 2");

-  while (TRUE) {

-    spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

-    palSetPad(PORT11, P11_LED1);        /* LED OFF.                         */

-    spiStart(&SPID2, &ls_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID2);                  /* Slave Select assertion.          */

-    spiExchange(&SPID2, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID2);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID2);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepare transmit pattern.

-   */

-  for (i = 0; i < sizeof(txbuf); i++)

-    txbuf[i] = (uint8_t)i;

-

-  /* Starting driver for test, DSPI_B I/O pins setup.*/

-  spiStart(&SPID2, &ls_spicfg);

-  SIU.PCR[102].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SCK    */

-  SIU.PCR[103].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SIN    */

-  SIU.PCR[104].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* SOUT   */

-  SIU.PCR[105].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* PCS[0] */

-  SIU.PCR[106].R = PAL_MODE_OUTPUT_ALTERNATE(1);    /* PCS[1] */

-

-  /* Testing sending and receiving at the same time.*/

-  spiExchange(&SPID2, 4, txbuf, rxbuf);

-  spiExchange(&SPID2, 32, txbuf, rxbuf);

-  spiExchange(&SPID2, 512, txbuf, rxbuf);

-

-  /* Testing clock pulses without data buffering.*/

-  spiIgnore(&SPID2, 4);

-  spiIgnore(&SPID2, 32);

-

-  /* Testing sending data ignoring incoming data.*/

-  spiSend(&SPID2, 4, txbuf);

-  spiSend(&SPID2, 32, txbuf);

-

-  /* Testing receiving data while sending idle bits (high level).*/

-  spiReceive(&SPID2, 4, rxbuf);

-  spiReceive(&SPID2, 32, rxbuf);

-

-  /* Testing stop procedure.*/

-  spiStop(&SPID2);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),

-                    NORMALPRIO + 1, spi_thread_1, NULL);

-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),

-                    NORMALPRIO + 1, spi_thread_2, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-    palTogglePad(PORT11, P11_LED2);

-  }

-  return 0;

-}

diff --git a/testhal/SPC564Axx/SPI/mcuconf.h b/testhal/SPC564Axx/SPI/mcuconf.h
deleted file mode 100644
index 1762945e5..000000000
--- a/testhal/SPC564Axx/SPI/mcuconf.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563Mxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC564Axx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_CLK_BYPASS                     FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_CLK_PREDIV_VALUE               2

-#define SPC5_CLK_MFD_VALUE                  75

-#define SPC5_CLK_RFD                        SPC5_RFD_DIV2

-#define SPC5_FLASH_BIUCR                    (BIUCR_BANK1_TOO |              \

-                                             BIUCR_MASTER4_PREFETCH |       \

-                                             BIUCR_MASTER0_PREFETCH |       \

-                                             BIUCR_DPFEN |                  \

-                                             BIUCR_IPFEN |                  \

-                                             BIUCR_PFLIM_ON_MISS |          \

-                                             BIUCR_BFEN)

-#define SPC5_EMIOS_GPRE_VALUE               20

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                (EDMA_CR_GRP3PRI(3) |           \

-                                             EDMA_CR_GRP2PRI(2) |           \

-                                             EDMA_CR_GRP1PRI(1) |           \

-                                             EDMA_CR_GRP0PRI(0) |           \

-                                             EDMA_CR_ERGA)

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_GROUP1_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_GROUP2_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_GROUP3_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * ADC driver settings.

- */

-#define SPC5_ADC_USE_ADC0_Q0                FALSE

-#define SPC5_ADC_USE_ADC0_Q1                FALSE

-#define SPC5_ADC_USE_ADC0_Q2                FALSE

-#define SPC5_ADC_USE_ADC1_Q3                FALSE

-#define SPC5_ADC_USE_ADC1_Q4                FALSE

-#define SPC5_ADC_USE_ADC1_Q5                FALSE

-#define SPC5_ADC_FIFO0_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO1_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO2_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO3_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO4_DMA_IRQ_PRIO         12

-#define SPC5_ADC_FIFO5_DMA_IRQ_PRIO         12

-#define SPC5_ADC_CR_CLK_PS                  ADC_CR_CLK_PS(10)

-#define SPC5_ADC_PUDCR                      {ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE,                \

-                                             ADC_PUDCR_NONE}

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_USE_ESCIA                      TRUE

-#define SPC5_USE_ESCIB                      TRUE

-#define SPC5_USE_ESCIC                      TRUE

-#define SPC5_ESCIA_PRIORITY                 8

-#define SPC5_ESCIB_PRIORITY                 8

-#define SPC5_ESCIC_PRIORITY                 8

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI1                  TRUE

-#define SPC5_SPI_USE_DSPI2                  TRUE

-#define SPC5_SPI_USE_DSPI3                  TRUE

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI3_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI3_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DSPI3_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

diff --git a/testhal/SPC564Axx/SPI/readme.txt b/testhal/SPC564Axx/SPI/readme.txt
deleted file mode 100644
index cd9368fb1..000000000
--- a/testhal/SPC564Axx/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SPI driver demo for SPC564Axx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC564Axx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC564Axx SPI driver.

-

-** Board Setup **

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC56ELxx/CAN/.cproject b/testhal/SPC56ELxx/CAN/.cproject
deleted file mode 100644
index dd958292f..000000000
--- a/testhal/SPC56ELxx/CAN/.cproject
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

-	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.439651492">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.439651492" moduleId="org.eclipse.cdt.core.settings" name="Default">

-				<externalSettings/>

-				<extensions>

-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-				</extensions>

-			</storageModule>

-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.439651492" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.439651492." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.654846538" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.654846538.2133046187" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1489786030" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.156030939" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1370244412" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1086534408" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1434538512" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2113752031" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.224865818" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1413837722" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-						</toolChain>

-					</folderInfo>

-				</configuration>

-			</storageModule>

-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

-		</cconfiguration>

-	</storageModule>

-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC56ELxx-PWM-ICU.null.382353215" name="SPC56ELxx-PWM-ICU"/>

-	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.439651492">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

-</cproject>

diff --git a/testhal/SPC56ELxx/CAN/.project b/testhal/SPC56ELxx/CAN/.project
deleted file mode 100644
index 80fb08c6f..000000000
--- a/testhal/SPC56ELxx/CAN/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC56ELxx-PWM-ICU</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC56EL</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC56ELxx/CAN/Makefile b/testhal/SPC56ELxx/CAN/Makefile
deleted file mode 100644
index 79d8dd648..000000000
--- a/testhal/SPC56ELxx/CAN/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-##############################################################################

-# This file is automatically generated and can be overwritten, do no change

-# this file manually.

-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti -fno-exceptions

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = out

-

-# Imported source files

-include components/components.mak

-

-# Checks if there is a user mak file in the project directory.

-ifneq ($(wildcard user.mak),) 

-    include user.mak

-endif

-

-# Define linker script file here

-LDSCRIPT= application.ld

-

-# C sources here.

-CSRC =      $(LIB_C_SRC) \

-            $(APP_C_SRC) \

-            $(U_C_SRC) \

-            ./components/components.c \

-            ./main.c

-

-# C++ sources here.

-CPPSRC =    $(LIB_CPP_SRC) \

-            $(APP_CPP_SRC) \

-            $(U_CPP_SRC)

-

-# List ASM source files here

-ASMSRC =    $(LIB_ASM_SRC) \

-            $(APP_ASM_SRC) \

-            $(U_ASM_SRC)

-

-INCDIR =    $(LIB_INCLUDES) \

-            $(APP_INCLUDES) \

-            ./components

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS   = -DSPC56EL60L3

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS  =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS   =

-

-#

-# End of default section

-##############################################################################

-

-include C:/SPC5Studio/eclipse/plugins/com.st.tools.spc5.components.platform.spc56elxx_1.0.0.201302201417/component/lib/rsc/rules.mk

diff --git a/testhal/SPC56ELxx/CAN/chconf.h b/testhal/SPC56ELxx/CAN/chconf.h
deleted file mode 100644
index 8800269d4..000000000
--- a/testhal/SPC56ELxx/CAN/chconf.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/CAN/halconf.h b/testhal/SPC56ELxx/CAN/halconf.h
deleted file mode 100644
index 7c9fe78a8..000000000
--- a/testhal/SPC56ELxx/CAN/halconf.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012,2013 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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/RT 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/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 TRUE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL               TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/CAN/main.c b/testhal/SPC56ELxx/CAN/main.c
deleted file mode 100644
index a0750898a..000000000
--- a/testhal/SPC56ELxx/CAN/main.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-struct can_instance {

-  CANDriver     *canp;

-  uint32_t      led;

-};

-

-static const struct can_instance can1 = {&CAND1, PD_LED1};

-

-/*

- * Internal loopback mode, 1MBaud.

- * See chapter 25 on the SPC5 reference manual.

- */

-static const CANConfig cancfg = {

-  CAN_MCR_WRN_EN,

-  CAN_CTRL_LPB | CAN_CTRL_PROPSEG(2) | CAN_CTRL_PSEG2(7) |

-  CAN_CTRL_PSEG1(3) | CAN_CTRL_PRESDIV(3)

-#if SPC5_CAN_USE_FILTERS

-  ,

-  {

-   {0, 0x00000001},

-   {1, 0x01234567},

-   {0, 0x00000000},

-   {0, 0x00000003},

-   {0, 0x00000004},

-   {0, 0x00000005},

-   {0, 0x00000006},

-   {0, 0x00000007}

-  }

-#endif

-};

-

-#if SPC5_CAN_USE_FILTERS

-flagsmask_t rxFlag;

-#endif

-

-/*

- * Receiver thread.

- */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  struct can_instance *cip = p;

-  EventListener el;

-  CANRxFrame rxmsg;

-  (void)p;

-  chRegSetThreadName("receiver");

-  chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-#if SPC5_CAN_USE_FILTERS

-  rxFlag = chEvtGetAndClearFlagsI(&el);

-#endif

-  while(!chThdShouldTerminate()) {

-    if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

-      continue;

-#if !SPC5_CAN_USE_FILTERS

-    while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_D, cip->led);

-    }

-#else

-    while (canReceive(cip->canp, rxFlag,

-                       &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

-      /* Process message.*/

-      palTogglePad(PORT_D, cip->led);

-    }

-#endif

-  }

-  chEvtUnregister(&CAND1.rxfull_event, &el);

-  return 0;

-}

-

-/*

- * Transmitter thread.

- */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

-  CANTxFrame txmsg;

-

-  (void)p;

-  chRegSetThreadName("transmitter");

-  txmsg.IDE = CAN_IDE_EXT;

-  txmsg.EID = 0x01234567;

-  txmsg.RTR = CAN_RTR_DATA;

-  txmsg.LENGTH = 8;

-  txmsg.data32[0] = 0x55AA55AA;

-  txmsg.data32[1] = 0x00FF00FF;

-

-  while (!chThdShouldTerminate()) {

-    canTransmit(&CAND1, 1, &txmsg, MS2ST(100));

-    palTogglePad(PORT_D, PD_LED2);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the CAN driver 1.

-   */

-  canStart(&CAND1, &cancfg);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(can_rx_wa, sizeof(can_rx_wa), NORMALPRIO + 7,

-                    can_rx, (void *)&can1);

-  chThdCreateStatic(can_tx_wa, sizeof(can_tx_wa), NORMALPRIO + 7,

-                    can_tx, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC56ELxx/CAN/mcuconf.h b/testhal/SPC56ELxx/CAN/mcuconf.h
deleted file mode 100644
index a310fd439..000000000
--- a/testhal/SPC56ELxx/CAN/mcuconf.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*

- * Licensed under ST Liberty SW License Agreement V2, (the "License");

- * You may not use this file except in compliance with the License.

- * You may obtain a copy of the License at:

- *

- *        http://www.st.com/software_license_agreement_liberty_v2

- *

- * Unless required by applicable law or agreed to in writing, software 

- * distributed under the License is distributed on an "AS IS" BASIS, 

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-/*

- * SPC56ELxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- */

-

-#define SPC56ELxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              32

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_SYSCLK_DIVIDER_VALUE           2

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL0

-#define SPC5_MCONTROL_DIVIDER_VALUE         2

-#define SPC5_SWG_DIVIDER_VALUE              2

-#define SPC5_AUX1CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXRAY_DIVIDER_VALUE          2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXCAN_DIVIDER_VALUE          2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  TRUE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_PWM_USE_SMOD4                  FALSE

-#define SPC5_PWM_USE_SMOD5                  FALSE

-#define SPC5_PWM_USE_SMOD6                  FALSE

-#define SPC5_PWM_USE_SMOD7                  FALSE

-#define SPC5_PWM_SMOD4_PRIORITY             7

-#define SPC5_PWM_SMOD5_PRIORITY             7

-#define SPC5_PWM_SMOD6_PRIORITY             7

-#define SPC5_PWM_SMOD7_PRIORITY             7

-#define SPC5_PWM_FLEXPWM1_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM1_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU driver system settings.

- */

-#define SPC5_ICU_USE_SMOD0                  TRUE

-#define SPC5_ICU_USE_SMOD1                  FALSE

-#define SPC5_ICU_USE_SMOD2                  FALSE

-#define SPC5_ICU_USE_SMOD3                  FALSE

-#define SPC5_ICU_USE_SMOD4                  FALSE

-#define SPC5_ICU_USE_SMOD5                  FALSE

-#define SPC5_ICU_ETIMER0_PRIORITY           7

-#define SPC5_ICU_ETIMER0_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER0_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD6                  FALSE

-#define SPC5_ICU_USE_SMOD7                  FALSE

-#define SPC5_ICU_USE_SMOD8                  FALSE

-#define SPC5_ICU_USE_SMOD9                  FALSE

-#define SPC5_ICU_USE_SMOD10                 FALSE

-#define SPC5_ICU_USE_SMOD11                 FALSE

-#define SPC5_ICU_ETIMER1_PRIORITY           7

-#define SPC5_ICU_ETIMER1_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER1_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD12                 FALSE

-#define SPC5_ICU_USE_SMOD13                 FALSE

-#define SPC5_ICU_USE_SMOD14                 FALSE

-#define SPC5_ICU_USE_SMOD15                 FALSE

-#define SPC5_ICU_USE_SMOD16                 FALSE

-#define SPC5_ICU_USE_SMOD17                 TRUE

-#define SPC5_ICU_ETIMER2_PRIORITY           7

-#define SPC5_ICU_ETIMER2_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER2_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * CAN driver system settings.

- */

-#define SPC5_CAN_USE_FILTERS                TRUE

-

-#define SPC5_CAN_USE_FLEXCAN0               TRUE

-#define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_CAN_USE_FLEXCAN1               FALSE

-#define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY      11

-#define SPC5_CAN_FLEXCAN1_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_CAN_FLEXCAN1_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC56ELxx/CAN/readme.txt b/testhal/SPC56ELxx/CAN/readme.txt
deleted file mode 100644
index 036a5502e..000000000
--- a/testhal/SPC56ELxx/CAN/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - CAN drivers demo for SPC56ELxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC56ELxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC56ELxx CAN drivers.

-

-** Board Setup **

-

-- Enable LED1 and LED2.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC56ELxx/PWM-ICU/.cproject b/testhal/SPC56ELxx/PWM-ICU/.cproject
deleted file mode 100644
index dd958292f..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/.cproject
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

-	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.439651492">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.439651492" moduleId="org.eclipse.cdt.core.settings" name="Default">

-				<externalSettings/>

-				<extensions>

-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-				</extensions>

-			</storageModule>

-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.439651492" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.439651492." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.654846538" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.654846538.2133046187" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1489786030" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.156030939" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1370244412" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1086534408" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1434538512" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2113752031" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.224865818" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1413837722" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-						</toolChain>

-					</folderInfo>

-				</configuration>

-			</storageModule>

-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

-		</cconfiguration>

-	</storageModule>

-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC56ELxx-PWM-ICU.null.382353215" name="SPC56ELxx-PWM-ICU"/>

-	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.439651492">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

-</cproject>

diff --git a/testhal/SPC56ELxx/PWM-ICU/.project b/testhal/SPC56ELxx/PWM-ICU/.project
deleted file mode 100644
index 80fb08c6f..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC56ELxx-PWM-ICU</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC56EL</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC56ELxx/PWM-ICU/Makefile b/testhal/SPC56ELxx/PWM-ICU/Makefile
deleted file mode 100644
index a6f7718ca..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC56EL/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC56ELxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC56ELxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC56EL60_LSM.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC56ELxx/PWM-ICU/chconf.h b/testhal/SPC56ELxx/PWM-ICU/chconf.h
deleted file mode 100644
index 50d8024a1..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/chconf.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-}

-#endif

-

-/**

- * @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) {                              \

-}

-#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() {                                                  \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/PWM-ICU/halconf.h b/testhal/SPC56ELxx/PWM-ICU/halconf.h
deleted file mode 100644
index 09022b9e7..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/halconf.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @name    Drivers enable switches

- */

-/**

- * @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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 TRUE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL               TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name ADC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name CAN driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name I2C driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MAC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name MMC_SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SDC driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              1

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SERIAL_USB driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Serial over USB buffers size.

- * @details Configuration parameter, the buffer size must be a multiple of

- *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_USB_BUFFERS_SIZE     64

-#endif

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name SPI driver related setting

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

-#endif

-/** @} */

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/PWM-ICU/main.c b/testhal/SPC56ELxx/PWM-ICU/main.c
deleted file mode 100644
index e6ac6281f..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/main.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-static void pwmpcb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palClearPad(PORT_D, PD_LED1);

-}

-

-static void pwmc1cb(PWMDriver *pwmp) {

-

-  (void)pwmp;

-  palSetPad(PORT_D, PD_LED1);

-}

-

-static PWMConfig pwmcfg = {

-  250000,                                   /* 250kHz PWM clock frequency.*/

-  50000,                                    /* Initial PWM period 0.2s.*/

-  pwmpcb,

-  {

-   {PWM_OUTPUT_ACTIVE_HIGH, pwmc1cb},

-   {PWM_OUTPUT_DISABLED, NULL}

-  },

-  PWM_ALIGN_EDGE

-};

-

-icucnt_t last_width, last_period;

-

-static void icuwidthcb(ICUDriver *icup) {

-

-  palSetPad(PORT_D, PD_LED2);

-  last_width = icuGetWidth(icup);

-}

-

-static void icuperiodcb(ICUDriver *icup) {

-

-  palClearPad(PORT_D, PD_LED2);

-  last_period = icuGetPeriod(icup);

-}

-

-static ICUConfig icucfg = {

-  ICU_INPUT_ACTIVE_HIGH,

-  250000,                                    /* 250kHz ICU clock frequency.*/

-  icuwidthcb,

-  icuperiodcb,

-  NULL

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-  /*

-   * Initializes the PWM driver 1 and ICU driver 1.

-   * GPIOD10 is the PWM output.

-   * GPIOA0 is the ICU input.

-   * The two pins have to be externally connected together.

-   */

-  icuStart(&ICUD1, &icucfg);

-  icuEnable(&ICUD1);

-

-  /* Sets A0 alternative function.*/

-  SIU.PCR[0].R = 0b0100010100000100;

-

-  pwmStart(&PWMD1, &pwmcfg);

-  /* Sets D10 alternative function.*/

-  SIU.PCR[58].R = 0b0100010100000100;

-

-  chThdSleepMilliseconds(2000);

-

-  /*

-   * Starts the PWM channel 0 using 75% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 50% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes the PWM channel 0 to 25% duty cycle.

-   */

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Changes PWM period and the PWM channel 0 to 50% duty cycle.

-   */

-  pwmChangePeriod(&PWMD1, 25000);

-  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

-  chThdSleepMilliseconds(5000);

-

-  /*

-   * Disables channel 0 and stops the drivers.

-   */

-  pwmDisableChannel(&PWMD1, 0);

-  pwmStop(&PWMD1);

-  icuDisable(&ICUD1);

-  icuStop(&ICUD1);

-  palClearPad(PORT_D, PD_LED3);

-  palClearPad(PORT_D, PD_LED4);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

diff --git a/testhal/SPC56ELxx/PWM-ICU/mcuconf.h b/testhal/SPC56ELxx/PWM-ICU/mcuconf.h
deleted file mode 100644
index 688a5def2..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/mcuconf.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC56ELxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC56ELxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              60

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_SYSCLK_DIVIDER_VALUE           2

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_MCONTROL_DIVIDER_VALUE         15

-#define SPC5_SWG_DIVIDER_VALUE              2

-#define SPC5_AUX1CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXRAY_DIVIDER_VALUE          2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXCAN_DIVIDER_VALUE          2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                0

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            2

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  TRUE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_PWM_USE_SMOD4                  FALSE

-#define SPC5_PWM_USE_SMOD5                  FALSE

-#define SPC5_PWM_USE_SMOD6                  FALSE

-#define SPC5_PWM_USE_SMOD7                  FALSE

-#define SPC5_PWM_SMOD4_PRIORITY             7

-#define SPC5_PWM_SMOD5_PRIORITY             7

-#define SPC5_PWM_SMOD6_PRIORITY             7

-#define SPC5_PWM_SMOD7_PRIORITY             7

-#define SPC5_PWM_FLEXPWM1_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM1_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU driver system settings.

- */

-#define SPC5_ICU_USE_SMOD0                  TRUE

-#define SPC5_ICU_USE_SMOD1                  FALSE

-#define SPC5_ICU_USE_SMOD2                  FALSE

-#define SPC5_ICU_USE_SMOD3                  FALSE

-#define SPC5_ICU_USE_SMOD4                  FALSE

-#define SPC5_ICU_USE_SMOD5                  FALSE

-#define SPC5_ICU_ETIMER0_PRIORITY           7

-#define SPC5_ICU_ETIMER0_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER0_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD6                  FALSE

-#define SPC5_ICU_USE_SMOD7                  FALSE

-#define SPC5_ICU_USE_SMOD8                  FALSE

-#define SPC5_ICU_USE_SMOD9                  FALSE

-#define SPC5_ICU_USE_SMOD10                 FALSE

-#define SPC5_ICU_USE_SMOD11                 FALSE

-#define SPC5_ICU_ETIMER1_PRIORITY           7

-#define SPC5_ICU_ETIMER1_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER1_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD12                 FALSE

-#define SPC5_ICU_USE_SMOD13                 FALSE

-#define SPC5_ICU_USE_SMOD14                 FALSE

-#define SPC5_ICU_USE_SMOD15                 FALSE

-#define SPC5_ICU_USE_SMOD16                 FALSE

-#define SPC5_ICU_USE_SMOD17                 TRUE

-#define SPC5_ICU_ETIMER2_PRIORITY           7

-#define SPC5_ICU_ETIMER2_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER2_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI0                  FALSE

-#define SPC5_SPI_USE_DSPI1                  FALSE

-#define SPC5_SPI_USE_DSPI2                  FALSE

-#define SPC5_SPI_DSPI0_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI0_TX1_DMA_CH_ID        4

-#define SPC5_SPI_DSPI0_TX2_DMA_CH_ID        5

-#define SPC5_SPI_DSPI0_RX_DMA_CH_ID         6

-#define SPC5_SPI_DSPI1_TX1_DMA_CH_ID        7

-#define SPC5_SPI_DSPI1_TX2_DMA_CH_ID        8

-#define SPC5_SPI_DSPI1_RX_DMA_CH_ID         9

-#define SPC5_SPI_DSPI2_TX1_DMA_CH_ID        10

-#define SPC5_SPI_DSPI2_TX2_DMA_CH_ID        11

-#define SPC5_SPI_DSPI2_RX_DMA_CH_ID         12

-#define SPC5_SPI_DSPI0_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI0_IRQ_PRIO             10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

-#define SPC5_SPI_DSPI0_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI0_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI1_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI1_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI2_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI2_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC56ELxx/PWM-ICU/readme.txt b/testhal/SPC56ELxx/PWM-ICU/readme.txt
deleted file mode 100644
index b17dba82f..000000000
--- a/testhal/SPC56ELxx/PWM-ICU/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - PWM/ICU drivers demo for SPC56ELxx.                    **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC56ELxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC56ELxx PWM-ICU drivers.

-

-** Board Setup **

-

-- Connect D10 and A0 together.

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/SPC56ELxx/SPI/.cproject b/testhal/SPC56ELxx/SPI/.cproject
deleted file mode 100644
index a4ae17c6d..000000000
--- a/testhal/SPC56ELxx/SPI/.cproject
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

-	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

-				<externalSettings/>

-				<extensions>

-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

-				</extensions>

-			</storageModule>

-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

-							</tool>

-						</toolChain>

-					</folderInfo>

-				</configuration>

-			</storageModule>

-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

-		</cconfiguration>

-	</storageModule>

-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-SPI.null.1461388361" name="SPC563Mxx-SPI"/>

-	</storageModule>

-	<storageModule moduleId="scannerConfiguration">

-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

-		</scannerConfigBuildInfo>

-	</storageModule>

-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

-</cproject>

diff --git a/testhal/SPC56ELxx/SPI/.project b/testhal/SPC56ELxx/SPI/.project
deleted file mode 100644
index c5157f21e..000000000
--- a/testhal/SPC56ELxx/SPI/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SPC56ELxx-SPI</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

-			<triggers>clean,full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

-			<triggers>full,incremental,</triggers>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.cdt.core.cnature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

-	</natures>

-	<linkedResources>

-		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC56EL</locationURI>

-		</link>

-		<link>

-			<name>os</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

-		</link>

-	</linkedResources>

-</projectDescription>

diff --git a/testhal/SPC56ELxx/SPI/Makefile b/testhal/SPC56ELxx/SPI/Makefile
deleted file mode 100644
index afc709b93..000000000
--- a/testhal/SPC56ELxx/SPI/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data.

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# Linker options here.

-ifeq ($(USE_LDOPT),)

-  USE_LDOPT = 

-endif

-

-# If enabled, this option allows to compile the application in VLE mode.

-ifeq ($(USE_VLE),)

-  USE_VLE = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_EVB_SPC56EL/board.mk

-include $(CHIBIOS)/os/hal/platforms/SPC56ELxx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/SPC56ELxx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/SPC56EL60_LSM.ld

-

-# C sources here.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       main.c

-

-# C++ sources here.

-CPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-#MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-

-#TRGT = powerpc-eabi-

-TRGT = ppc-vle-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS = -D_SPC560P50L5_

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-include $(CHIBIOS)/os/ports/GCC/PPC/rules.mk

diff --git a/testhal/SPC56ELxx/SPI/chconf.h b/testhal/SPC56ELxx/SPI/chconf.h
deleted file mode 100644
index dc956ef13..000000000
--- a/testhal/SPC56ELxx/SPI/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/SPI/halconf.h b/testhal/SPC56ELxx/SPI/halconf.h
deleted file mode 100644
index fdc079aef..000000000
--- a/testhal/SPC56ELxx/SPI/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/SPC56ELxx/SPI/main.c b/testhal/SPC56ELxx/SPI/main.c
deleted file mode 100644
index ef283f656..000000000
--- a/testhal/SPC56ELxx/SPI/main.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * Maximum speed SPI configuration.

- */

-static const SPIConfig hs_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV2 | SPC5_CTAR_ASC_DIV2 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV2,                       /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(1)                           /* PUSHR.   */

-};

-

-/*

- * Low speed SPI configuration.

- */

-static const SPIConfig ls_spicfg = {

-  NULL,

-  0,

-  0,

-  SPC5_CTAR_CSSCK_DIV64 | SPC5_CTAR_ASC_DIV64 | SPC5_CTAR_FMSZ(8) |

-  SPC5_CTAR_PBR_PRE2 | SPC5_CTAR_BR_DIV256,                     /* CTAR0.   */

-  SPC5_PUSHR_CONT | SPC5_PUSHR_PCS(0)                           /* PUSHR.   */

-};

-

-/*

- * SPI TX and RX buffers.

- */

-static uint8_t txbuf[512];

-static uint8_t rxbuf[512];

-

-/*

- * SPI bus contender 1.

- */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 1");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palClearPad(PORT_D, PD_LED1);       /* LED ON.                          */

-    spiStart(&SPID1, &hs_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * SPI bus contender 2.

- */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

-

-  (void)p;

-  chRegSetThreadName("SPI thread 2");

-  while (TRUE) {

-    spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

-    palSetPad(PORT_D, PD_LED1);         /* LED OFF.                         */

-    spiStart(&SPID1, &ls_spicfg);       /* Setup transfer parameters.       */

-    spiSelect(&SPID1);                  /* Slave Select assertion.          */

-    spiExchange(&SPID1, 512,

-                txbuf, rxbuf);          /* Atomic transfer operations.      */

-    spiUnselect(&SPID1);                /* Slave Select de-assertion.       */

-    spiReleaseBus(&SPID1);              /* Ownership release.               */

-  }

-  return 0;

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-  unsigned i;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Prepare transmit pattern.

-   */

-  for (i = 0; i < sizeof(txbuf); i++)

-    txbuf[i] = (uint8_t)i;

-

-  /* Starting driver for test, DSPI_0 I/O pins setup.*/

-  spiStart(&SPID1, &ls_spicfg);

-  SIU.PCR[37].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SCK    */

-  SIU.PCR[38].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* SOUT   */

-  SIU.PCR[36].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* CS[0]  */

-  SIU.PCR[54].R = PAL_MODE_OUTPUT_ALTERNATE(1);     /* CS[2]  */

-

-  /* Testing sending and receiving at the same time.*/

-  spiExchange(&SPID1, 4, txbuf, rxbuf);

-  spiExchange(&SPID1, 32, txbuf, rxbuf);

-  spiExchange(&SPID1, 512, txbuf, rxbuf);

-

-  /* Testing clock pulses without data buffering.*/

-  spiIgnore(&SPID1, 4);

-  spiIgnore(&SPID1, 32);

-

-  /* Testing sending data ignoring incoming data.*/

-  spiSend(&SPID1, 4, txbuf);

-  spiSend(&SPID1, 32, txbuf);

-

-  /* Testing receiving data while sending idle bits (high level).*/

-  spiReceive(&SPID1, 4, rxbuf);

-  spiReceive(&SPID1, 32, rxbuf);

-

-  /* Testing stop procedure.*/

-  spiStop(&SPID1);

-

-  /*

-   * Starting the transmitter and receiver threads.

-   */

-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),

-                    NORMALPRIO + 1, spi_thread_1, NULL);

-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),

-                    NORMALPRIO + 1, spi_thread_2, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-    palTogglePad(PORT_D, PD_LED2);

-  }

-  return 0;

-}

diff --git a/testhal/SPC56ELxx/SPI/mcuconf.h b/testhal/SPC56ELxx/SPI/mcuconf.h
deleted file mode 100644
index 4b96e87f4..000000000
--- a/testhal/SPC56ELxx/SPI/mcuconf.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*

-    SPC5 HAL - Copyright (C) 2013 STMicroelectronics

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC56ELxx drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 1...15       Lowest...Highest.

- * DMA priorities:

- * 0...15       Highest...Lowest.

- */

-

-#define SPC56ELxx_MCUCONF

-

-/*

- * HAL driver system settings.

- */

-#define SPC5_NO_INIT                        FALSE

-#define SPC5_ALLOW_OVERCLOCK                FALSE

-#define SPC5_DISABLE_WATCHDOG               TRUE

-#define SPC5_FMPLL0_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL0_IDF_VALUE               5

-#define SPC5_FMPLL0_NDIV_VALUE              60

-#define SPC5_FMPLL0_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_FMPLL1_CLK_SRC                 SPC5_FMPLL_SRC_XOSC

-#define SPC5_FMPLL1_IDF_VALUE               5

-#define SPC5_FMPLL1_NDIV_VALUE              60

-#define SPC5_FMPLL1_ODF                     SPC5_FMPLL_ODF_DIV4

-#define SPC5_SYSCLK_DIVIDER_VALUE           2

-#define SPC5_AUX0CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_MCONTROL_DIVIDER_VALUE         15

-#define SPC5_SWG_DIVIDER_VALUE              2

-#define SPC5_AUX1CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXRAY_DIVIDER_VALUE          2

-#define SPC5_AUX2CLK_SRC                    SPC5_CGM_SS_FMPLL1

-#define SPC5_FLEXCAN_DIVIDER_VALUE          2

-#define SPC5_ME_ME_BITS                     (SPC5_ME_ME_RUN1 |              \

-                                             SPC5_ME_ME_RUN2 |              \

-                                             SPC5_ME_ME_RUN3 |              \

-                                             SPC5_ME_ME_HALT0 |             \

-                                             SPC5_ME_ME_STOP0)

-#define SPC5_ME_SAFE_MC_BITS                (SPC5_ME_MC_PDO)

-#define SPC5_ME_DRUN_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN0_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN1_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN2_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN3_MC_BITS                (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_HALT0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_STOP0_MC_BITS               (SPC5_ME_MC_SYSCLK_FMPLL0 |     \

-                                             SPC5_ME_MC_IRCON |             \

-                                             SPC5_ME_MC_XOSC0ON |           \

-                                             SPC5_ME_MC_PLL0ON |            \

-                                             SPC5_ME_MC_PLL1ON |            \

-                                             SPC5_ME_MC_FLAON_NORMAL |      \

-                                             SPC5_ME_MC_MVRON)

-#define SPC5_ME_RUN_PC3_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC4_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC5_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC6_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_RUN_PC7_BITS                (SPC5_ME_RUN_PC_RUN0 |          \

-                                             SPC5_ME_RUN_PC_RUN1 |          \

-                                             SPC5_ME_RUN_PC_RUN2 |          \

-                                             SPC5_ME_RUN_PC_RUN3)

-#define SPC5_ME_LP_PC4_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC5_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC6_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_ME_LP_PC7_BITS                 (SPC5_ME_LP_PC_HALT0 |          \

-                                             SPC5_ME_LP_PC_STOP0)

-#define SPC5_CLOCK_FAILURE_HOOK()           chSysHalt()

-

-/*

- * EDMA driver settings.

- */

-#define SPC5_EDMA_CR_SETTING                0

-#define SPC5_EDMA_GROUP0_PRIORITIES                                         \

-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

-#define SPC5_EDMA_ERROR_IRQ_PRIO            12

-#define SPC5_EDMA_ERROR_HANDLER()           chSysHalt()

-

-/*

- * SERIAL driver system settings.

- */

-#define SPC5_SERIAL_USE_LINFLEX0            TRUE

-#define SPC5_SERIAL_USE_LINFLEX1            TRUE

-#define SPC5_SERIAL_LINFLEX0_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX1_PRIORITY       8

-#define SPC5_SERIAL_LINFLEX0_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX0_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SERIAL_LINFLEX1_START_PCTL     (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SERIAL_LINFLEX1_STOP_PCTL      (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * PWM driver system settings.

- */

-#define SPC5_PWM_USE_SMOD0                  FALSE

-#define SPC5_PWM_USE_SMOD1                  FALSE

-#define SPC5_PWM_USE_SMOD2                  FALSE

-#define SPC5_PWM_USE_SMOD3                  FALSE

-#define SPC5_PWM_SMOD0_PRIORITY             7

-#define SPC5_PWM_SMOD1_PRIORITY             7

-#define SPC5_PWM_SMOD2_PRIORITY             7

-#define SPC5_PWM_SMOD3_PRIORITY             7

-#define SPC5_PWM_FLEXPWM0_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM0_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_PWM_USE_SMOD4                  FALSE

-#define SPC5_PWM_USE_SMOD5                  FALSE

-#define SPC5_PWM_USE_SMOD6                  FALSE

-#define SPC5_PWM_USE_SMOD7                  FALSE

-#define SPC5_PWM_SMOD4_PRIORITY             7

-#define SPC5_PWM_SMOD5_PRIORITY             7

-#define SPC5_PWM_SMOD6_PRIORITY             7

-#define SPC5_PWM_SMOD7_PRIORITY             7

-#define SPC5_PWM_FLEXPWM1_START_PCTL        (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_PWM_FLEXPWM1_STOP_PCTL         (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * ICU driver system settings.

- */

-#define SPC5_ICU_USE_SMOD0                  FALSE

-#define SPC5_ICU_USE_SMOD1                  FALSE

-#define SPC5_ICU_USE_SMOD2                  FALSE

-#define SPC5_ICU_USE_SMOD3                  FALSE

-#define SPC5_ICU_USE_SMOD4                  FALSE

-#define SPC5_ICU_USE_SMOD5                  FALSE

-#define SPC5_ICU_ETIMER0_PRIORITY           7

-#define SPC5_ICU_ETIMER0_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER0_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD6                  FALSE

-#define SPC5_ICU_USE_SMOD7                  FALSE

-#define SPC5_ICU_USE_SMOD8                  FALSE

-#define SPC5_ICU_USE_SMOD9                  FALSE

-#define SPC5_ICU_USE_SMOD10                 FALSE

-#define SPC5_ICU_USE_SMOD11                 FALSE

-#define SPC5_ICU_ETIMER1_PRIORITY           7

-#define SPC5_ICU_ETIMER1_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER1_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-#define SPC5_ICU_USE_SMOD12                 FALSE

-#define SPC5_ICU_USE_SMOD13                 FALSE

-#define SPC5_ICU_USE_SMOD14                 FALSE

-#define SPC5_ICU_USE_SMOD15                 FALSE

-#define SPC5_ICU_USE_SMOD16                 FALSE

-#define SPC5_ICU_USE_SMOD17                 TRUE

-#define SPC5_ICU_ETIMER2_PRIORITY           7

-#define SPC5_ICU_ETIMER2_START_PCTL         (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_ICU_ETIMER2_STOP_PCTL          (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-

-/*

- * SPI driver system settings.

- */

-#define SPC5_SPI_USE_DSPI0                  TRUE

-#define SPC5_SPI_USE_DSPI1                  TRUE

-#define SPC5_SPI_USE_DSPI2                  TRUE

-#define SPC5_SPI_DSPI0_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI1_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI2_MCR                  (SPC5_MCR_PCSIS0 |              \

-                                             SPC5_MCR_PCSIS1 |              \

-                                             SPC5_MCR_PCSIS2 |              \

-                                             SPC5_MCR_PCSIS3 |              \

-                                             SPC5_MCR_PCSIS4 |              \

-                                             SPC5_MCR_PCSIS5 |              \

-                                             SPC5_MCR_PCSIS6 |              \

-                                             SPC5_MCR_PCSIS7)

-#define SPC5_SPI_DSPI0_TX1_DMA_CH_ID        4

-#define SPC5_SPI_DSPI0_TX2_DMA_CH_ID        5

-#define SPC5_SPI_DSPI0_RX_DMA_CH_ID         6

-#define SPC5_SPI_DSPI1_TX1_DMA_CH_ID        7

-#define SPC5_SPI_DSPI1_TX2_DMA_CH_ID        8

-#define SPC5_SPI_DSPI1_RX_DMA_CH_ID         9

-#define SPC5_SPI_DSPI2_TX1_DMA_CH_ID        10

-#define SPC5_SPI_DSPI2_TX2_DMA_CH_ID        11

-#define SPC5_SPI_DSPI2_RX_DMA_CH_ID         12

-#define SPC5_SPI_DSPI0_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI1_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI2_DMA_IRQ_PRIO         10

-#define SPC5_SPI_DSPI0_IRQ_PRIO             10

-#define SPC5_SPI_DSPI1_IRQ_PRIO             10

-#define SPC5_SPI_DSPI2_IRQ_PRIO             10

-#define SPC5_SPI_DMA_ERROR_HOOK(spip)       chSysHalt()

-#define SPC5_SPI_DSPI0_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI0_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI1_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI1_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

-#define SPC5_SPI_DSPI2_START_PCTL           (SPC5_ME_PCTL_RUN(1) |          \

-                                             SPC5_ME_PCTL_LP(2))

-#define SPC5_SPI_DSPI2_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \

-                                             SPC5_ME_PCTL_LP(0))

diff --git a/testhal/SPC56ELxx/SPI/readme.txt b/testhal/SPC56ELxx/SPI/readme.txt
deleted file mode 100644
index 96da3df24..000000000
--- a/testhal/SPC56ELxx/SPI/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SPI driver demo for SPC56ELxx.                         **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an STMicroelectronics SPC56ELxx microcontroller installed on 

-XPC56xx EVB Motherboard.

-

-** The Demo **

-

-The application demonstrates the use of the SPC56ELxx SPI driver.

-

-** Board Setup **

-

-** Build Procedure **

-

-The demo has been tested using HighTec compiler.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-

-                             http://www.st.com

diff --git a/testhal/STM32F0xx/ADC/.cproject b/testhal/STM32F0xx/ADC/.cproject
index a3fb831a8..6398488ab 100644
--- a/testhal/STM32F0xx/ADC/.cproject
+++ b/testhal/STM32F0xx/ADC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/ADC/.project b/testhal/STM32F0xx/ADC/.project
index 4aa2b6463..7c94c96a4 100644
--- a/testhal/STM32F0xx/ADC/.project
+++ b/testhal/STM32F0xx/ADC/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/ADC/Makefile b/testhal/STM32F0xx/ADC/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/ADC/Makefile
+++ b/testhal/STM32F0xx/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/ADC/chconf.h b/testhal/STM32F0xx/ADC/chconf.h
index 2e6fcc6ee..89abbc2dc 100644
--- a/testhal/STM32F0xx/ADC/chconf.h
+++ b/testhal/STM32F0xx/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       FALSE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/ADC/halconf.h b/testhal/STM32F0xx/ADC/halconf.h
index a719ec40a..23d81defc 100644
--- a/testhal/STM32F0xx/ADC/halconf.h
+++ b/testhal/STM32F0xx/ADC/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/ADC/main.c b/testhal/STM32F0xx/ADC/main.c
index 90b05df1a..86eb71780 100644
--- a/testhal/STM32F0xx/ADC/main.c
+++ b/testhal/STM32F0xx/ADC/main.c
@@ -83,7 +83,7 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F0xx/ADC/mcuconf.h b/testhal/STM32F0xx/ADC/mcuconf.h
index cca199b9c..652af90a1 100644
--- a/testhal/STM32F0xx/ADC/mcuconf.h
+++ b/testhal/STM32F0xx/ADC/mcuconf.h
@@ -89,11 +89,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/STM32F0xx/EXT/.cproject b/testhal/STM32F0xx/EXT/.cproject
index 818c355d4..ad1273b16 100644
--- a/testhal/STM32F0xx/EXT/.cproject
+++ b/testhal/STM32F0xx/EXT/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/EXT/.project b/testhal/STM32F0xx/EXT/.project
index 301651983..bae993cd8 100644
--- a/testhal/STM32F0xx/EXT/.project
+++ b/testhal/STM32F0xx/EXT/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/EXT/Makefile b/testhal/STM32F0xx/EXT/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/EXT/Makefile
+++ b/testhal/STM32F0xx/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/EXT/chconf.h b/testhal/STM32F0xx/EXT/chconf.h
index 2e6fcc6ee..0e7bac72f 100644
--- a/testhal/STM32F0xx/EXT/chconf.h
+++ b/testhal/STM32F0xx/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/EXT/halconf.h b/testhal/STM32F0xx/EXT/halconf.h
index 1069ba5c1..5b67db37b 100644
--- a/testhal/STM32F0xx/EXT/halconf.h
+++ b/testhal/STM32F0xx/EXT/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/EXT/main.c b/testhal/STM32F0xx/EXT/main.c
index cdba37eff..2fdcc247e 100644
--- a/testhal/STM32F0xx/EXT/main.c
+++ b/testhal/STM32F0xx/EXT/main.c
@@ -25,17 +25,16 @@ static void led4off(void *arg) {
 

 /* Triggered when the button is pressed or released. The LED4 is set to ON.*/

 static void extcb1(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

+  static virtual_timer_t vt4;

 

   (void)extp;

   (void)channel;

   palSetPad(GPIOC, GPIOC_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  chSysLockFromISR();

+  chVTResetI(&vt4);

   /* LED4 set to OFF after 200mS.*/

   chVTSetI(&vt4, MS2ST(200), led4off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static const EXTConfig extcfg = {

diff --git a/testhal/STM32F0xx/EXT/mcuconf.h b/testhal/STM32F0xx/EXT/mcuconf.h
index ea61b3dec..df3f85580 100644
--- a/testhal/STM32F0xx/EXT/mcuconf.h
+++ b/testhal/STM32F0xx/EXT/mcuconf.h
@@ -89,11 +89,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/STM32F0xx/IRQ_STORM/.cproject b/testhal/STM32F0xx/IRQ_STORM/.cproject
index aea7bcbae..8c3040aad 100644
--- a/testhal/STM32F0xx/IRQ_STORM/.cproject
+++ b/testhal/STM32F0xx/IRQ_STORM/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/IRQ_STORM/.project b/testhal/STM32F0xx/IRQ_STORM/.project
index a3027689a..8c63b9bf4 100644
--- a/testhal/STM32F0xx/IRQ_STORM/.project
+++ b/testhal/STM32F0xx/IRQ_STORM/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/IRQ_STORM/Makefile b/testhal/STM32F0xx/IRQ_STORM/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F0xx/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/IRQ_STORM/chconf.h b/testhal/STM32F0xx/IRQ_STORM/chconf.h
index f943ea80c..1b81d6805 100644
--- a/testhal/STM32F0xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32F0xx/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       FALSE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/IRQ_STORM/halconf.h b/testhal/STM32F0xx/IRQ_STORM/halconf.h
index d91a792b4..40207d045 100644
--- a/testhal/STM32F0xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32F0xx/IRQ_STORM/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/IRQ_STORM/main.c b/testhal/STM32F0xx/IRQ_STORM/main.c
index 4a11fcad8..22baf6e62 100644
--- a/testhal/STM32F0xx/IRQ_STORM/main.c
+++ b/testhal/STM32F0xx/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -121,11 +121,11 @@ static void gpt2cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -135,11 +135,11 @@ static void gpt3cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -148,6 +148,7 @@ static void gpt3cb(GPTDriver *gptp) {
 static const GPTConfig gpt2cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt2cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -157,6 +158,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -217,14 +219,14 @@ int main(void) {
   sdStart(&SD1, NULL);

   palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(1));       /* USART1 TX.       */

   palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(1));      /* USART1 RX.       */

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD1, &gpt2cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -239,19 +241,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -287,10 +289,10 @@ int main(void) {
     saturated = FALSE;

     threshold = 0;

     for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD1);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -311,7 +313,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD1);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

diff --git a/testhal/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32F0xx/IRQ_STORM/mcuconf.h
index 1a719e0ce..2a9c91850 100644
--- a/testhal/STM32F0xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F0xx/IRQ_STORM/mcuconf.h
@@ -77,23 +77,24 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM1                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         2

+#define STM32_GPT_TIM1_IRQ_PRIORITY         1

 #define STM32_GPT_TIM2_IRQ_PRIORITY         2

-#define STM32_GPT_TIM3_IRQ_PRIORITY         2

+#define STM32_GPT_TIM3_IRQ_PRIORITY         3

 

 /*

  * I2C driver system settings.

  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/STM32F0xx/PWM-ICU/.cproject b/testhal/STM32F0xx/PWM-ICU/.cproject
index b8b1e0f2b..e2fc31de7 100644
--- a/testhal/STM32F0xx/PWM-ICU/.cproject
+++ b/testhal/STM32F0xx/PWM-ICU/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/PWM-ICU/.project b/testhal/STM32F0xx/PWM-ICU/.project
index 60ef1bb65..021a42109 100644
--- a/testhal/STM32F0xx/PWM-ICU/.project
+++ b/testhal/STM32F0xx/PWM-ICU/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/PWM-ICU/Makefile b/testhal/STM32F0xx/PWM-ICU/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/PWM-ICU/Makefile
+++ b/testhal/STM32F0xx/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/PWM-ICU/chconf.h b/testhal/STM32F0xx/PWM-ICU/chconf.h
index 2e6fcc6ee..0e7bac72f 100644
--- a/testhal/STM32F0xx/PWM-ICU/chconf.h
+++ b/testhal/STM32F0xx/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/PWM-ICU/halconf.h b/testhal/STM32F0xx/PWM-ICU/halconf.h
index 501792854..c1a492c2d 100644
--- a/testhal/STM32F0xx/PWM-ICU/halconf.h
+++ b/testhal/STM32F0xx/PWM-ICU/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/PWM-ICU/main.c b/testhal/STM32F0xx/PWM-ICU/main.c
index 9de2c2eea..fa4c4de8c 100644
--- a/testhal/STM32F0xx/PWM-ICU/main.c
+++ b/testhal/STM32F0xx/PWM-ICU/main.c
@@ -90,11 +90,11 @@ int main(void) {
   /*

    * Initializes the PWM driver 2 and ICU driver 3.

    * GPIOA6 is the ICU input (CH1).

-   * GPIOA15 is the PWM output (CH1).

+   * GPIOA8 is the PWM output (CH1).

    * The two pins have to be externally connected together.

    */

-  pwmStart(&PWMD2, &pwmcfg);

-  palSetPadMode(GPIOA, 15, PAL_MODE_ALTERNATE(2));

+  pwmStart(&PWMD1, &pwmcfg);

+  palSetPadMode(GPIOA, 8, PAL_MODE_ALTERNATE(2));

   icuStart(&ICUD3, &icucfg);

   palSetPadMode(GPIOA, 6, PAL_MODE_ALTERNATE(1));

   icuEnable(&ICUD3);

@@ -103,33 +103,33 @@ int main(void) {
   /*

    * Starts the PWM channel 0 using 75% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 7500));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 50% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 5000));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 25% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 2500));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes PWM period to half second the duty cycle becomes 50%

    * implicitly.

    */

-  pwmChangePeriod(&PWMD2, 5000);

+  pwmChangePeriod(&PWMD1, 5000);

   chThdSleepMilliseconds(5000);

 

   /*

    * Disables channel 0 and stops the drivers.

    */

-  pwmDisableChannel(&PWMD2, 0);

-  pwmStop(&PWMD2);

+  pwmDisableChannel(&PWMD1, 0);

+  pwmStop(&PWMD1);

   icuDisable(&ICUD3);

   icuStop(&ICUD3);

   palClearPad(GPIOC, GPIOC_LED3);

diff --git a/testhal/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32F0xx/PWM-ICU/mcuconf.h
index 8e7779960..b4678a1f6 100644
--- a/testhal/STM32F0xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F0xx/PWM-ICU/mcuconf.h
@@ -89,11 +89,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -109,8 +110,8 @@
  * PWM driver system settings.

  */

 #define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  TRUE

+#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         3

 #define STM32_PWM_TIM2_IRQ_PRIORITY         3

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/STM32F0xx/PWM-ICU/readme.txt b/testhal/STM32F0xx/PWM-ICU/readme.txt
index eccb291d3..a0c549b3b 100644
--- a/testhal/STM32F0xx/PWM-ICU/readme.txt
+++ b/testhal/STM32F0xx/PWM-ICU/readme.txt
@@ -12,7 +12,7 @@ The application demonstrates the use of the STM32F0xx PWM-ICU drivers.
 

 ** Board Setup **

 

-- Connect PA15 and PC6 together.

+- Connect PA8 and PA6 together.

 

 ** Build Procedure **

 

diff --git a/testhal/STM32F0xx/SPI/.cproject b/testhal/STM32F0xx/SPI/.cproject
index d5cace391..dd317e872 100644
--- a/testhal/STM32F0xx/SPI/.cproject
+++ b/testhal/STM32F0xx/SPI/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/SPI/.project b/testhal/STM32F0xx/SPI/.project
index be544ce50..1e19b44f3 100644
--- a/testhal/STM32F0xx/SPI/.project
+++ b/testhal/STM32F0xx/SPI/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/SPI/Makefile b/testhal/STM32F0xx/SPI/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/SPI/Makefile
+++ b/testhal/STM32F0xx/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/SPI/chconf.h b/testhal/STM32F0xx/SPI/chconf.h
index 2e6fcc6ee..0e7bac72f 100644
--- a/testhal/STM32F0xx/SPI/chconf.h
+++ b/testhal/STM32F0xx/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/SPI/halconf.h b/testhal/STM32F0xx/SPI/halconf.h
index fdc079aef..99f546dd1 100644
--- a/testhal/STM32F0xx/SPI/halconf.h
+++ b/testhal/STM32F0xx/SPI/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/SPI/main.c b/testhal/STM32F0xx/SPI/main.c
index 0f6313022..5c0226b94 100644
--- a/testhal/STM32F0xx/SPI/main.c
+++ b/testhal/STM32F0xx/SPI/main.c
@@ -48,7 +48,7 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

 static msg_t spi_thread_1(void *p) {

 

   (void)p;

@@ -69,7 +69,7 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

 static msg_t spi_thread_2(void *p) {

 

   (void)p;

@@ -90,7 +90,7 @@ static msg_t spi_thread_2(void *p) {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(blinker_wa, 128);

+static THD_WORKING_AREA(blinker_wa, 128);

 static msg_t blinker(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F0xx/SPI/mcuconf.h b/testhal/STM32F0xx/SPI/mcuconf.h
index cf60d78be..33146eb6a 100644
--- a/testhal/STM32F0xx/SPI/mcuconf.h
+++ b/testhal/STM32F0xx/SPI/mcuconf.h
@@ -89,11 +89,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/STM32F0xx/UART/.cproject b/testhal/STM32F0xx/UART/.cproject
index 9dc8b7121..46c45aefc 100644
--- a/testhal/STM32F0xx/UART/.cproject
+++ b/testhal/STM32F0xx/UART/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F0xx/UART/.project b/testhal/STM32F0xx/UART/.project
index d05252ac5..03d8ce7d4 100644
--- a/testhal/STM32F0xx/UART/.project
+++ b/testhal/STM32F0xx/UART/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F0_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F0_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F0xx/UART/Makefile b/testhal/STM32F0xx/UART/Makefile
index 0b2d556fb..ab318e781 100644
--- a/testhal/STM32F0xx/UART/Makefile
+++ b/testhal/STM32F0xx/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x200

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F0_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F0xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F0xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F051x8.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F0xx/UART/chconf.h b/testhal/STM32F0xx/UART/chconf.h
index 2e6fcc6ee..0e7bac72f 100644
--- a/testhal/STM32F0xx/UART/chconf.h
+++ b/testhal/STM32F0xx/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F0xx/UART/halconf.h b/testhal/STM32F0xx/UART/halconf.h
index a4fc70926..e9b103442 100644
--- a/testhal/STM32F0xx/UART/halconf.h
+++ b/testhal/STM32F0xx/UART/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F0xx/UART/main.c b/testhal/STM32F0xx/UART/main.c
index aa52aeb77..9df75bb9d 100644
--- a/testhal/STM32F0xx/UART/main.c
+++ b/testhal/STM32F0xx/UART/main.c
@@ -17,15 +17,15 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt1, vt2;

+static virtual_timer_t vt1, vt2;

 

 static void restart(void *p) {

 

   (void)p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   uartStartSendI(&UARTD1, 14, "Hello World!\r\n");

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static void ledoff(void *p) {

@@ -51,11 +51,10 @@ static void txend2(UARTDriver *uartp) {
 

   (void)uartp;

   palClearPad(GPIOC, GPIOC_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt1))

-    chVTResetI(&vt1);

+  chSysLockFromISR();

+  chVTResetI(&vt1);

   chVTSetI(&vt1, MS2ST(5000), restart, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -78,11 +77,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
   (void)c;

   /* Flashing the LED each time a character is received.*/

   palSetPad(GPIOC, GPIOC_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt2))

-    chVTResetI(&vt2);

+  chSysLockFromISR();

+  chVTResetI(&vt2);

   chVTSetI(&vt2, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32F0xx/UART/mcuconf.h b/testhal/STM32F0xx/UART/mcuconf.h
index fb5ea8f3d..1fd22d532 100644
--- a/testhal/STM32F0xx/UART/mcuconf.h
+++ b/testhal/STM32F0xx/UART/mcuconf.h
@@ -89,11 +89,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -133,7 +134,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         2

 #define STM32_SPI_SPI2_IRQ_PRIORITY         2

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               2

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -144,4 +151,4 @@
 #define STM32_UART_USART2_IRQ_PRIORITY      3

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

diff --git a/testhal/SPC563Mxx/ADC/.cproject b/testhal/STM32F1xx/ADC/.cproject
index 57b44e9a8..96718979f 100644
--- a/testhal/SPC563Mxx/ADC/.cproject
+++ b/testhal/STM32F1xx/ADC/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.1678860195">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1678860195" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.689012726">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.689012726" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1678860195" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.1678860195." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1571587928" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1571587928.1795056389" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1130620788" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.437964627" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1681283326" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.760214315" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.689012726" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.689012726." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1927048022" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1927048022.133421332" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.860237702" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1015298275" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1849946851" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.782791296" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1674700670" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.916577449" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.801978059" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.610180386" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.450240264" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1298250760" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1670728915" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1480940900" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,18 +39,18 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-ADC.null.2088541646" name="SPC563Mxx-ADC"/>

+		<project id="STM32F1xx-ADC.null.964703683" name="STM32F1xx-ADC"/>

+	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope" versionNumber="2">

+		<configuration configurationName="Default">

+			<resource resourceType="PROJECT" workspacePath="/STM32F1xx-ADC"/>

+		</configuration>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.1678860195">

+		<scannerConfigBuildInfo instanceId="0.689012726">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

-	<storageModule moduleId="refreshScope" versionNumber="2">

-		<configuration configurationName="Default">

-			<resource resourceType="PROJECT" workspacePath="/SPC563Mxx-ADC"/>

-		</configuration>

-	</storageModule>

-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/SPC563Mxx/SPI/.project b/testhal/STM32F1xx/ADC/.project
index 31139adbb..b0614142a 100644
--- a/testhal/SPC563Mxx/SPI/.project
+++ b/testhal/STM32F1xx/ADC/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>SPC563Mxx-SPI</name>

+	<name>STM32F1xx-ADC</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC563M</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32F1xx/ADC/Makefile b/testhal/STM32F1xx/ADC/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32F1xx/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/ADC/chconf.h b/testhal/STM32F1xx/ADC/chconf.h
index 2e6fcc6ee..49a557804 100644
--- a/testhal/STM32F1xx/ADC/chconf.h
+++ b/testhal/STM32F1xx/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/ADC/halconf.h b/testhal/STM32F1xx/ADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F1xx/ADC/halconf.h
+++ b/testhal/STM32F1xx/ADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/ADC/main.c b/testhal/STM32F1xx/ADC/main.c
index 43ae179ee..3fcbafbfc 100644
--- a/testhal/STM32F1xx/ADC/main.c
+++ b/testhal/STM32F1xx/ADC/main.c
@@ -89,10 +89,11 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     palClearPad(IOPORT3, GPIOC_LED);

diff --git a/testhal/STM32F1xx/ADC/mcuconf.h b/testhal/STM32F1xx/ADC/mcuconf.h
index 1b3927677..8ca927071 100644
--- a/testhal/STM32F1xx/ADC/mcuconf.h
+++ b/testhal/STM32F1xx/ADC/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC563Mxx/ICU-PWM/.cproject b/testhal/STM32F1xx/CAN/.cproject
index 47fbf4bbe..bac08e768 100644
--- a/testhal/SPC563Mxx/ICU-PWM/.cproject
+++ b/testhal/STM32F1xx/CAN/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.457472625">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.457472625" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.457472625" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.457472625." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1578227776" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1578227776.2016553402" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1859100235" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.464442828" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.160996748" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1168254841" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1638738921" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1866935439" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.211250026" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.956289449" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,13 +39,18 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-ICU-PWM.null.1461388361" name="SPC563Mxx-ICU-PWM"/>

+		<project id="STM32F1xx-CAN.null.1230102001" name="STM32F1xx-CAN"/>

+	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope" versionNumber="2">

+		<configuration configurationName="Default">

+			<resource resourceType="PROJECT" workspacePath="/STM32F1xx-CAN"/>

+		</configuration>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

+		<scannerConfigBuildInfo instanceId="0.457472625">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/SPC560Pxx/SPI/.project b/testhal/STM32F1xx/CAN/.project
index c0c005e49..bd246b63d 100644
--- a/testhal/SPC560Pxx/SPI/.project
+++ b/testhal/STM32F1xx/CAN/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>SPC560Pxx-SPI</name>

+	<name>STM32F1xx-CAN</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC560P</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32F1xx/CAN/Makefile b/testhal/STM32F1xx/CAN/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32F1xx/CAN/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/CAN/chconf.h b/testhal/STM32F1xx/CAN/chconf.h
index f943ea80c..49a557804 100644
--- a/testhal/STM32F1xx/CAN/chconf.h
+++ b/testhal/STM32F1xx/CAN/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/CAN/halconf.h b/testhal/STM32F1xx/CAN/halconf.h
index 5b6535967..a1195d7e1 100644
--- a/testhal/STM32F1xx/CAN/halconf.h
+++ b/testhal/STM32F1xx/CAN/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/CAN/main.c b/testhal/STM32F1xx/CAN/main.c
index 43164e1ce..39fdc29ae 100644
--- a/testhal/STM32F1xx/CAN/main.c
+++ b/testhal/STM32F1xx/CAN/main.c
@@ -31,18 +31,18 @@ static const CANConfig cancfg = {
 /*

  * Receiver thread.

  */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  EventListener el;

+static THD_WORKING_AREA(can_rx_wa, 256);

+static THD_FUNCTION(can_rx, p) {

+  event_listener_t el;

   CANRxFrame rxmsg;

 

   (void)p;

   chRegSetThreadName("receiver");

   chEvtRegister(&CAND1.rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

+  while(!chThdShouldTerminateX()) {

     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

       continue;

-    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

+    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {

       /* Process message.*/

       palTogglePad(IOPORT3, GPIOC_LED);

     }

@@ -54,8 +54,8 @@ static msg_t can_rx(void *p) {
 /*

  * Transmitter thread.

  */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

+static THD_WORKING_AREA(can_tx_wa, 256);

+static THD_FUNCTION(can_tx, p) {

   CANTxFrame txmsg;

 

   (void)p;

@@ -67,7 +67,7 @@ static msg_t can_tx(void * p) {
   txmsg.data32[0] = 0x55AA55AA;

   txmsg.data32[1] = 0x00FF00FF;

 

-  while (!chThdShouldTerminate()) {

+  while (!chThdShouldTerminateX()) {

     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     chThdSleepMilliseconds(500);

   }

diff --git a/testhal/STM32F1xx/CAN/mcuconf.h b/testhal/STM32F1xx/CAN/mcuconf.h
index 06bc8c715..39cf40780 100644
--- a/testhal/STM32F1xx/CAN/mcuconf.h
+++ b/testhal/STM32F1xx/CAN/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/EXT/.cproject b/testhal/STM32F1xx/EXT/.cproject
new file mode 100644
index 000000000..5afcfb4ad
--- /dev/null
+++ b/testhal/STM32F1xx/EXT/.cproject
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?fileVersion 4.0.0?>

+

+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+	<storageModule moduleId="org.eclipse.cdt.core.settings">

+		<cconfiguration id="0.646412173">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.646412173" moduleId="org.eclipse.cdt.core.settings" name="Default">

+				<externalSettings/>

+				<extensions>

+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+				</extensions>

+			</storageModule>

+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.646412173" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.646412173." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.309374526" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.309374526.193476693" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1842174708" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1579021985" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.900909178" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.505157820" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.880984302" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1605048205" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.18208459" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.733296333" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+						</toolChain>

+					</folderInfo>

+				</configuration>

+			</storageModule>

+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

+		</cconfiguration>

+	</storageModule>

+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+		<project id="STM32F1xx-EXT.null.811239142" name="STM32F1xx-EXT"/>

+	</storageModule>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<scannerConfigBuildInfo instanceId="0.646412173">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+		</scannerConfigBuildInfo>

+	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope" versionNumber="2">

+		<configuration configurationName="Default">

+			<resource resourceType="PROJECT" workspacePath="/STM32F1xx-EXT"/>

+		</configuration>

+	</storageModule>

+</cproject>

diff --git a/testhal/STM32F1xx/EXT/.project b/testhal/STM32F1xx/EXT/.project
new file mode 100644
index 000000000..41d3deffa
--- /dev/null
+++ b/testhal/STM32F1xx/EXT/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>STM32F1xx-EXT</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/testhal/STM32F1xx/EXT/Makefile b/testhal/STM32F1xx/EXT/Makefile
index e9b6719d7..59c540dfd 100644
--- a/testhal/STM32F1xx/EXT/Makefile
+++ b/testhal/STM32F1xx/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,14 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -74,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -108,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -133,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -153,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -198,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/EXT/chconf.h b/testhal/STM32F1xx/EXT/chconf.h
index 2e6fcc6ee..49a557804 100644
--- a/testhal/STM32F1xx/EXT/chconf.h
+++ b/testhal/STM32F1xx/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/EXT/halconf.h b/testhal/STM32F1xx/EXT/halconf.h
index e0e0c38ff..5b67db37b 100644
--- a/testhal/STM32F1xx/EXT/halconf.h
+++ b/testhal/STM32F1xx/EXT/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/EXT/main.c b/testhal/STM32F1xx/EXT/main.c
index e0fcd896c..1ca4260d0 100644
--- a/testhal/STM32F1xx/EXT/main.c
+++ b/testhal/STM32F1xx/EXT/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt;

+static virtual_timer_t vt;

 

 /* LED set to OFF after 200mS.*/

 static void ledoff(void *arg) {

@@ -32,10 +32,9 @@ static void extcb1(EXTDriver *extp, expchannel_t channel) {
   (void)extp;

   (void)channel;

   palClearPad(GPIOC, GPIOC_LED);

-  chSysLockFromIsr();

-  if (!chVTIsArmedI(&vt))

-    chVTSetI(&vt, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTSetI(&vt, MS2ST(200), ledoff, NULL);

+  chSysUnlockFromISR();

 }

 

 /* Triggered when the LED goes OFF.*/

diff --git a/testhal/STM32F1xx/EXT/mcuconf.h b/testhal/STM32F1xx/EXT/mcuconf.h
index d7d712736..b261fb50d 100644
--- a/testhal/STM32F1xx/EXT/mcuconf.h
+++ b/testhal/STM32F1xx/EXT/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/GPT/chconf.h b/testhal/STM32F1xx/GPT/chconf.h
deleted file mode 100644
index f943ea80c..000000000
--- a/testhal/STM32F1xx/GPT/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/GPT/halconf.h b/testhal/STM32F1xx/GPT/halconf.h
deleted file mode 100644
index 554b4e9ca..000000000
--- a/testhal/STM32F1xx/GPT/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 TRUE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/GPT/main.c b/testhal/STM32F1xx/GPT/main.c
deleted file mode 100644
index d247980e3..000000000
--- a/testhal/STM32F1xx/GPT/main.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * GPT1 callback.

- */

-static void gpt1cb(GPTDriver *gptp) {

-

-  (void)gptp;

-  palClearPad(IOPORT3, GPIOC_LED);

-  chSysLockFromIsr();

-  gptStartOneShotI(&GPTD2, 200);   /* 0.02 second pulse.*/

-  chSysUnlockFromIsr();

-}

-

-/*

- * GPT2 callback.

- */

-static void gpt2cb(GPTDriver *gptp) {

-

-  (void)gptp;

-  palSetPad(IOPORT3, GPIOC_LED);

-}

-

-/*

- * GPT1 configuration.

- */

-static const GPTConfig gpt1cfg = {

-  10000,    /* 10kHz timer clock.*/

-  gpt1cb,   /* Timer callback.*/

-  0

-};

-

-/*

- * GPT2 configuration.

- */

-static const GPTConfig gpt2cfg = {

-  10000,    /* 10kHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

-  0

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes the GPT drivers 1 and 2.

-   */

-  gptStart(&GPTD1, &gpt1cfg);

-  gptPolledDelay(&GPTD1, 10); /* Small delay.*/

-  gptStart(&GPTD2, &gpt2cfg);

-  gptPolledDelay(&GPTD2, 10); /* Small delay.*/

-

-  /*

-   * Normal main() thread activity, it changes the GPT1 period every

-   * five seconds.

-   */

-  while (TRUE) {

-    gptStartContinuous(&GPTD1, 5000);

-    chThdSleepMilliseconds(5000);

-    gptStopTimer(&GPTD1);

-    gptStartContinuous(&GPTD1, 2500);

-    chThdSleepMilliseconds(5000);

-    gptStopTimer(&GPTD1);

-  }

-  return 0;

-}

diff --git a/testhal/STM32F1xx/GPT/mcuconf.h b/testhal/STM32F1xx/GPT/mcuconf.h
deleted file mode 100644
index e987d18f5..000000000
--- a/testhal/STM32F1xx/GPT/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  TRUE

-#define STM32_GPT_USE_TIM2                  TRUE

-#define STM32_GPT_USE_TIM3                  TRUE

-#define STM32_GPT_USE_TIM4                  TRUE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             FALSE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  FALSE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F1xx/I2C/Makefile b/testhal/STM32F1xx/I2C/Makefile
deleted file mode 100644
index 24cebda3b..000000000
--- a/testhal/STM32F1xx/I2C/Makefile
+++ /dev/null
@@ -1,220 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 -Wall -Wextra

-  #USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16 -Wall -Wextra

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_103STK/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c \

-       i2c_pns.c \

-  	   tmp75.c \

-  	   fake.c \

-  	   lis3.c

-  	   

-

-	   

-       

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m3

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-

-LD   = $(TRGT)gcc 

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT = 

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes 

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR = 

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

-

-

diff --git a/testhal/STM32F1xx/I2C/chconf.h b/testhal/STM32F1xx/I2C/chconf.h
deleted file mode 100644
index c1dec4b48..000000000
--- a/testhal/STM32F1xx/I2C/chconf.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/* Kernel parameters.                                                        */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 0//20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/*===========================================================================*/

-/* Performance options.                                                      */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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               FALSE

-#endif

-

-/*===========================================================================*/

-/* Subsystem options.                                                        */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 FALSE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           FALSE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

-#if !defined(CH_USE_HEAP) || defined(__DOXYGEN__)

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/*===========================================================================*/

-/* Debug options.                                                            */

-/*===========================================================================*/

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/*===========================================================================*/

-/* Kernel hooks.                                                             */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/I2C/fake.c b/testhal/STM32F1xx/I2C/fake.c
deleted file mode 100644
index 74fc44539..000000000
--- a/testhal/STM32F1xx/I2C/fake.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * Not responding slave test

- */

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "fake.h"

-

-

-/* input buffer */

-static uint8_t rx_data[2];

-

-/* temperature value */

-static int16_t temperature = 0;

-

-static i2cflags_t errors = 0;

-

-#define addr 0b1001100

-

-/* This is main function. */

-void request_fake(void){

-  msg_t status = RDY_OK;

-  systime_t tmo = MS2ST(4);

-

-  i2cAcquireBus(&I2CD1);

-  status = i2cMasterReceiveTimeout(&I2CD1, addr, rx_data, 2, tmo);

-  i2cReleaseBus(&I2CD1);

-

-  if (status == RDY_RESET){

-    errors = i2cGetErrors(&I2CD1);

-    if (errors == I2CD_ACK_FAILURE){

-      /* there is no slave with given address on the bus, or it was die */

-      return;

-    }

-  }

-

-  else{

-    temperature = (rx_data[0] << 8) + rx_data[1];

-  }

-}

-

-

diff --git a/testhal/STM32F1xx/I2C/fake.h b/testhal/STM32F1xx/I2C/fake.h
deleted file mode 100644
index 2869b0c93..000000000
--- a/testhal/STM32F1xx/I2C/fake.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#ifndef FAKE_H_

-#define FAKE_H_

-

-void request_fake(void);

-

-#endif /* FAKE_H_ */

diff --git a/testhal/STM32F1xx/I2C/halconf.h b/testhal/STM32F1xx/I2C/halconf.h
deleted file mode 100644
index 3ac5de5ba..000000000
--- a/testhal/STM32F1xx/I2C/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 TRUE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/I2C/i2c_pns.c b/testhal/STM32F1xx/I2C/i2c_pns.c
deleted file mode 100644
index 3cb568ce8..000000000
--- a/testhal/STM32F1xx/I2C/i2c_pns.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#include "i2c_pns.h"

-#include "lis3.h"

-

-

-/* I2C1 */

-static const I2CConfig i2cfg1 = {

-    OPMODE_I2C,

-    400000,

-    FAST_DUTY_CYCLE_2,

-};

-

-

-

-void I2CInit_pns(void){

-  i2cInit();

-

-  i2cStart(&I2CD1, &i2cfg1);

-

-  /* tune ports for I2C1*/

-  palSetPadMode(IOPORT2, 6, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);

-  palSetPadMode(IOPORT2, 7, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);

-

-  chThdSleepMilliseconds(100);  /* Just to be safe. */

-

-  init_lis3();                  /* accelerometer init */

-}

-

-

diff --git a/testhal/STM32F1xx/I2C/i2c_pns.h b/testhal/STM32F1xx/I2C/i2c_pns.h
deleted file mode 100644
index b01c85b7e..000000000
--- a/testhal/STM32F1xx/I2C/i2c_pns.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#ifndef I2C_PNS_H_

-#define I2C_PNS_H_

-

-

-void I2CInit_pns(void);

-

-

-#endif /* I2C_PNS_H_ */

diff --git a/testhal/STM32F1xx/I2C/lis3.c b/testhal/STM32F1xx/I2C/lis3.c
deleted file mode 100644
index e55d1180e..000000000
--- a/testhal/STM32F1xx/I2C/lis3.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * This is device realize "read through write" paradigm. This is not

- * standard, but most of I2C devices use this paradigm.

- * You must write to device reading address, send restart to bus,

- * and then begin reading process.

- */

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "lis3.h"

-

-

-#define lis3_addr 0b0011101

-

-

-/* buffers */

-static uint8_t accel_rx_data[ACCEL_RX_DEPTH];

-static uint8_t accel_tx_data[ACCEL_TX_DEPTH];

-

-static i2cflags_t errors = 0;

-

-static int16_t acceleration_x = 0;

-static int16_t acceleration_y = 0;

-static int16_t acceleration_z = 0;

-

-

-/**

- * Init function. Here we will also start personal serving thread.

- */

-int init_lis3(void){

-  msg_t status = RDY_OK;

-  systime_t tmo = MS2ST(4);

-

-  /* configure accelerometer */

-  accel_tx_data[0] = ACCEL_CTRL_REG1 | AUTO_INCREMENT_BIT; /* register address */

-  accel_tx_data[1] = 0b11100111;

-  accel_tx_data[2] = 0b01000001;

-  accel_tx_data[3] = 0b00000000;

-

-  /* sending */

-  i2cAcquireBus(&I2CD1);

-  status = i2cMasterTransmitTimeout(&I2CD1, lis3_addr, accel_tx_data, 4, accel_rx_data, 0, tmo);

-  i2cReleaseBus(&I2CD1);

-

-  if (status != RDY_OK){

-    errors = i2cGetErrors(&I2CD1);

-  }

-

-  return 0;

-}

-

-/**

- *

- */

-void request_acceleration_data(void){

-  msg_t status = RDY_OK;

-  systime_t tmo = MS2ST(4);

-

-  accel_tx_data[0] = ACCEL_OUT_DATA | AUTO_INCREMENT_BIT; /* register address */

-  i2cAcquireBus(&I2CD1);

-  status = i2cMasterTransmitTimeout(&I2CD1, lis3_addr, accel_tx_data, 1, accel_rx_data, 6, tmo);

-  i2cReleaseBus(&I2CD1);

-

-  if (status != RDY_OK){

-    errors = i2cGetErrors(&I2CD1);

-  }

-

-  acceleration_x = accel_rx_data[0] + (accel_rx_data[1] << 8);

-  acceleration_y = accel_rx_data[2] + (accel_rx_data[3] << 8);

-  acceleration_z = accel_rx_data[4] + (accel_rx_data[5] << 8);

-}

-

diff --git a/testhal/STM32F1xx/I2C/lis3.h b/testhal/STM32F1xx/I2C/lis3.h
deleted file mode 100644
index f48b7cd20..000000000
--- a/testhal/STM32F1xx/I2C/lis3.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdlib.h>

-#include "ch.h"

-

-#ifndef LIS3_H_

-#define LIS3_H_

-

-

-

-/* buffers depth */

-#define ACCEL_RX_DEPTH 8

-#define ACCEL_TX_DEPTH 8

-

-/* autoincrement bit position. This bit needs to perform reading of

- * multiple bytes at one request */

-#define AUTO_INCREMENT_BIT (1<<7)

-

-/* slave specific addresses */

-#define ACCEL_STATUS_REG  0x27

-#define ACCEL_CTRL_REG1   0x20

-#define ACCEL_OUT_DATA    0x28

-

-

-

-inline int init_lis3(void);

-inline void request_acceleration_data(void);

-

-

-#endif /* LIS3_H_ */

diff --git a/testhal/STM32F1xx/I2C/main.c b/testhal/STM32F1xx/I2C/main.c
deleted file mode 100644
index cba3dad3a..000000000
--- a/testhal/STM32F1xx/I2C/main.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

-   Concepts and parts of this file have been contributed by Uladzimir Pylinsky

-   aka barthess.

- */

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "i2c_pns.h"

-#include "lis3.h"

-#include "tmp75.h"

-#include "fake.h"

-

-

-/*

- * Red LEDs blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(BlinkWA, 64);

-static msg_t Blink(void *arg) {

-  chRegSetThreadName("Blink");

-  (void)arg;

-  while (TRUE) {

-    palClearPad(IOPORT3, GPIOC_LED);

-    chThdSleepMilliseconds(500);

-    palSetPad(IOPORT3, GPIOC_LED);

-    chThdSleepMilliseconds(500);

-  }

-  return 0;

-}

-

-/*

- * Accelerometer thread

- */

-static WORKING_AREA(PollAccelThreadWA, 256);

-static msg_t PollAccelThread(void *arg) {

-  chRegSetThreadName("PollAccel");

-  (void)arg;

-  while (TRUE) {

-    /*chThdSleepMilliseconds(rand() & 31);*/

-    chThdSleepMilliseconds(32);

-    request_acceleration_data();

-  }

-  return 0;

-}

-

-

-/* Temperature polling thread */

-static WORKING_AREA(PollTmp75ThreadWA, 256);

-static msg_t PollTmp75Thread(void *arg) {

-  chRegSetThreadName("PollTmp75");

-  (void)arg;

-  while (TRUE) {

-    /*chThdSleepMilliseconds(rand() & 31);*/

-    chThdSleepMilliseconds(15);

-    /* Call reading function */

-    request_temperature();

-  }

-  return 0;

-}

-

-

-/* Temperature polling thread */

-static WORKING_AREA(PollFakeThreadWA, 256);

-static msg_t PollFakeThread(void *arg) {

-  chRegSetThreadName("PollFake");

-  (void)arg;

-  while (TRUE) {

-    chThdSleepMilliseconds(16);

-    /* Call reading function */

-    request_fake();

-  }

-  return 0;

-}

-

-

-/*

- * Entry point, note, the main() function is already a thread in the system

- * on entry.

- */

-int main(void) {

-

-  halInit();

-  chSysInit();

-

-  chThdSleepMilliseconds(200);

-  I2CInit_pns();

-

-  /* Create accelerometer thread */

-  chThdCreateStatic(PollAccelThreadWA,

-          sizeof(PollAccelThreadWA),

-          NORMALPRIO,

-          PollAccelThread,

-          NULL);

-

-  /* Create temperature thread */

-  chThdCreateStatic(PollTmp75ThreadWA,

-          sizeof(PollTmp75ThreadWA),

-          NORMALPRIO,

-          PollTmp75Thread,

-          NULL);

-

-  /* Create not responding thread */

-  chThdCreateStatic(PollFakeThreadWA,

-          sizeof(PollFakeThreadWA),

-          NORMALPRIO,

-          PollFakeThread,

-          NULL);

-

-  /* Creates the blinker thread. */

-  chThdCreateStatic(BlinkWA, sizeof(BlinkWA), HIGHPRIO, Blink, NULL);

-

-  /* main loop that do nothing */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-

-  return 0;

-}

diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h
deleted file mode 100644
index a5748e0e8..000000000
--- a/testhal/STM32F1xx/I2C/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  TRUE

-#define STM32_I2C_USE_I2C2                  TRUE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             FALSE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  FALSE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F1xx/I2C/tmp75.c b/testhal/STM32F1xx/I2C/tmp75.c
deleted file mode 100644
index 478c322fa..000000000
--- a/testhal/STM32F1xx/I2C/tmp75.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * TMP75 is most simple I2C device in our case. It is already useful with

- * default settings after powerup.

- * You only must read 2 sequential bytes from it.

- */

-

-#include <stdlib.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "tmp75.h"

-

-

-/* input buffer */

-static uint8_t tmp75_rx_data[TMP75_RX_DEPTH];

-

-/* temperature value */

-static int16_t temperature = 0;

-

-static i2cflags_t errors = 0;

-

-#define tmp75_addr 0b1001000

-

-/* This is main function. */

-void request_temperature(void){

-  int16_t t_int = 0, t_frac = 0;

-  msg_t status = RDY_OK;

-  systime_t tmo = MS2ST(4);

-

-  i2cAcquireBus(&I2CD1);

-  status = i2cMasterReceiveTimeout(&I2CD1, tmp75_addr, tmp75_rx_data, 2, tmo);

-  i2cReleaseBus(&I2CD1);

-

-  if (status != RDY_OK){

-    errors = i2cGetErrors(&I2CD1);

-  }

-

-  t_int = tmp75_rx_data[0] * 100;

-  t_frac = (tmp75_rx_data[1] * 100) >> 8;

-  temperature = t_int + t_frac;

-}

-

-

diff --git a/testhal/STM32F1xx/I2C/tmp75.h b/testhal/STM32F1xx/I2C/tmp75.h
deleted file mode 100644
index 57729b9db..000000000
--- a/testhal/STM32F1xx/I2C/tmp75.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#ifndef TMP75_H_

-#define TMP75_H_

-

-

-

-/* buffers depth */

-#define TMP75_RX_DEPTH 2

-#define TMP75_TX_DEPTH 2

-

-void init_tmp75(void);

-void request_temperature(void);

-

-#endif /* TMP75_H_ */

diff --git a/testhal/STM32F1xx/IRQ_STORM/.cproject b/testhal/STM32F1xx/IRQ_STORM/.cproject
new file mode 100644
index 000000000..34b2612a8
--- /dev/null
+++ b/testhal/STM32F1xx/IRQ_STORM/.cproject
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?fileVersion 4.0.0?>

+

+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+	<storageModule moduleId="org.eclipse.cdt.core.settings">

+		<cconfiguration id="0.1100010532">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1100010532" moduleId="org.eclipse.cdt.core.settings" name="Default">

+				<externalSettings/>

+				<extensions>

+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+				</extensions>

+			</storageModule>

+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1100010532" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1100010532." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.113082466" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.113082466.1065436593" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1117666960" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1441446606" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1030925514" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.900090689" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1121224778" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1014679055" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1534569136" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.755547447" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+						</toolChain>

+					</folderInfo>

+				</configuration>

+			</storageModule>

+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

+		</cconfiguration>

+	</storageModule>

+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+		<project id="STM32F1xx-IRQ_STORM.null.1112295605" name="STM32F1xx-IRQ_STORM"/>

+	</storageModule>

+	<storageModule moduleId="scannerConfiguration">

+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

+		<scannerConfigBuildInfo instanceId="0.1100010532">

+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

+		</scannerConfigBuildInfo>

+	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+</cproject>

diff --git a/testhal/STM32F1xx/IRQ_STORM/.project b/testhal/STM32F1xx/IRQ_STORM/.project
new file mode 100644
index 000000000..8a26197ea
--- /dev/null
+++ b/testhal/STM32F1xx/IRQ_STORM/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>STM32F1xx-IRQ_STORM</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/testhal/STM32F1xx/IRQ_STORM/Makefile b/testhal/STM32F1xx/IRQ_STORM/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F1xx/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/IRQ_STORM/chconf.h b/testhal/STM32F1xx/IRQ_STORM/chconf.h
index f943ea80c..a1efc5bbf 100644
--- a/testhal/STM32F1xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32F1xx/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/IRQ_STORM/halconf.h b/testhal/STM32F1xx/IRQ_STORM/halconf.h
index 117a5979b..40207d045 100644
--- a/testhal/STM32F1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32F1xx/IRQ_STORM/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/IRQ_STORM/main.c b/testhal/STM32F1xx/IRQ_STORM/main.c
index a029e02dc..51806a45b 100644
--- a/testhal/STM32F1xx/IRQ_STORM/main.c
+++ b/testhal/STM32F1xx/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -115,48 +115,50 @@ static msg_t WorkerThread(void *arg) {
 }

 

 /*

- * GPT1 callback.

+ * GPT2 callback.

  */

-static void gpt1cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

- * GPT2 callback.

+ * GPT3 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt3cb(GPTDriver *gptp) {

   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

- * GPT1 configuration.

+ * GPT2 configuration.

  */

-static const GPTConfig gpt1cfg = {

+static const GPTConfig gpt4cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt1cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

 /*

- * GPT2 configuration.

+ * GPT3 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -212,17 +214,21 @@ int main(void) {
   chSysInit();

 

   /*

-   * Prepares the Serial driver 2 and GPT drivers 1 and 2.

+   * Activates the serial driver 2.

+   */

+  sdStart(&SD2, NULL);

+

+  /*

+   * Activates GPTs.

    */

-  sdStart(&SD2, NULL);          /* Default is 38400-8-N-1.*/

-  gptStart(&GPTD1, &gpt1cfg);

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD4, &gpt4cfg);

+  gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -237,19 +243,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -284,12 +290,12 @@ int main(void) {
     println("");

     saturated = FALSE;

     threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD1, interval - 1); /* Slightly out of phase.*/

-      gptStartContinuous(&GPTD2, interval + 1); /* Slightly out of phase.*/

+    for (interval = 2000; interval >= 10; interval -= interval / 10) {

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

+      gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD1);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

+      gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

       else {

@@ -309,8 +315,8 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD1);

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

+  gptStopTimer(&GPTD3);

 

   print("Worst case at ");

   printn(worst);

@@ -324,5 +330,4 @@ int main(void) {
   while (TRUE) {

     chThdSleepMilliseconds(5000);

   }

-  return 0;

 }

diff --git a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
index e607b235c..ae5c645da 100644
--- a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
@@ -84,16 +84,16 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  TRUE

-#define STM32_GPT_USE_TIM2                  TRUE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

+#define STM32_GPT_USE_TIM1                  FALSE

+#define STM32_GPT_USE_TIM2                  FALSE

+#define STM32_GPT_USE_TIM3                  TRUE

+#define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         6

-#define STM32_GPT_TIM2_IRQ_PRIORITY         10

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM1_IRQ_PRIORITY         7

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

+#define STM32_GPT_TIM3_IRQ_PRIORITY         6

+#define STM32_GPT_TIM4_IRQ_PRIORITY         10

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

 

@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC560Pxx/CAN/.cproject b/testhal/STM32F1xx/PWM-ICU/.cproject
index 18c26cafe..b98eb835e 100644
--- a/testhal/SPC560Pxx/CAN/.cproject
+++ b/testhal/STM32F1xx/PWM-ICU/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.1369345018">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1369345018" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.1229818570">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1229818570" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1369345018" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.1369345018." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1823023415" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1823023415.859203435" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.2144664825" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1509533538" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1597619528" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1283370538" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1229818570" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1229818570." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.751543939" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.751543939.568340602" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.2063090894" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1150192802" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.163634784" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2040622876" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.802256572" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1714507025" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.458623590" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2137124777" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.867090134" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1980093876" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1840158116" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.93618382" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,11 +39,11 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC560Pxx-PWM-ICU.null.1141335251" name="SPC560Pxx-PWM-ICU"/>

+		<project id="STM32F1xx-PWM-ICU.null.1208061050" name="STM32F1xx-PWM-ICU"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.1369345018">

+		<scannerConfigBuildInfo instanceId="0.1229818570">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

diff --git a/testhal/STM32F1xx/PWM-ICU/.project b/testhal/STM32F1xx/PWM-ICU/.project
new file mode 100644
index 000000000..dc64cb828
--- /dev/null
+++ b/testhal/STM32F1xx/PWM-ICU/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>STM32F1xx-PWM-ICU</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/testhal/STM32F1xx/PWM-ICU/Makefile b/testhal/STM32F1xx/PWM-ICU/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/PWM-ICU/Makefile
+++ b/testhal/STM32F1xx/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/PWM-ICU/chconf.h b/testhal/STM32F1xx/PWM-ICU/chconf.h
index f943ea80c..49a557804 100644
--- a/testhal/STM32F1xx/PWM-ICU/chconf.h
+++ b/testhal/STM32F1xx/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/PWM-ICU/halconf.h b/testhal/STM32F1xx/PWM-ICU/halconf.h
index 2f74c82c8..c1a492c2d 100644
--- a/testhal/STM32F1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32F1xx/PWM-ICU/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/PWM-ICU/mcuconf.h b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
index de845bbbe..f0963d15c 100644
--- a/testhal/STM32F1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/RTC/Makefile b/testhal/STM32F1xx/RTC/Makefile
deleted file mode 100644
index 3d28124f2..000000000
--- a/testhal/STM32F1xx/RTC/Makefile
+++ /dev/null
@@ -1,211 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       $(CHIBIOS)/os/various/chrtclib.c \

-       main.c \

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m3

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-

-LD   = $(TRGT)gcc 

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT = 

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes 

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR = 

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F1xx/RTC/chconf.h b/testhal/STM32F1xx/RTC/chconf.h
deleted file mode 100644
index c1dec4b48..000000000
--- a/testhal/STM32F1xx/RTC/chconf.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/* Kernel parameters.                                                        */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 0//20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/*===========================================================================*/

-/* Performance options.                                                      */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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               FALSE

-#endif

-

-/*===========================================================================*/

-/* Subsystem options.                                                        */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 FALSE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           FALSE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

-#if !defined(CH_USE_HEAP) || defined(__DOXYGEN__)

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 FALSE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/*===========================================================================*/

-/* Debug options.                                                            */

-/*===========================================================================*/

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/*===========================================================================*/

-/* Kernel hooks.                                                             */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/RTC/halconf.h b/testhal/STM32F1xx/RTC/halconf.h
deleted file mode 100644
index 388e9a080..000000000
--- a/testhal/STM32F1xx/RTC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/RTC/main.c b/testhal/STM32F1xx/RTC/main.c
deleted file mode 100644
index 1d43b33ad..000000000
--- a/testhal/STM32F1xx/RTC/main.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#include "chrtclib.h"

-

-RTCTime timespec;

-RTCAlarm alarmspec;

-

-#define TEST_ALARM_WAKEUP FALSE

-

-

-#if TEST_ALARM_WAKEUP

-

-/* sleep indicator thread */

-static WORKING_AREA(blinkWA, 128);

-static msg_t blink_thd(void *arg){

-  (void)arg;

-  while (TRUE) {

-    chThdSleepMilliseconds(100);

-    palTogglePad(GPIOC, GPIOC_LED);

-  }

-  return 0;

-}

-

-int main(void) {

-  halInit();

-  chSysInit();

-

-  chThdCreateStatic(blinkWA, sizeof(blinkWA), NORMALPRIO, blink_thd, NULL);

-  /* set alarm in near future */

-  rtcGetTime(&RTCD1, &timespec);

-  alarmspec.tv_sec = timespec.tv_sec + 30;

-  rtcSetAlarm(&RTCD1, 0, &alarmspec);

-

-  while (TRUE){

-    chThdSleepSeconds(10);

-    chSysLock();

-

-    /* going to anabiosis*/

-    PWR->CR |= (PWR_CR_PDDS | PWR_CR_LPDS | PWR_CR_CSBF | PWR_CR_CWUF);

-    SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;

-    __WFI();

-  }

-  return 0;

-}

-

-#else /* TEST_ALARM_WAKEUP */

-

-/* Manually reloaded test alarm period.*/

-#define RTC_ALARMPERIOD   10

-

-BinarySemaphore alarm_sem;

-

-static void my_cb(RTCDriver *rtcp, rtcevent_t event) {

-

-  (void)rtcp;

-

-  switch (event) {

-  case RTC_EVENT_OVERFLOW:

-    palTogglePad(GPIOC, GPIOC_LED);

-    break;

-  case RTC_EVENT_SECOND:

-    /* palTogglePad(GPIOC, GPIOC_LED); */

-    break;

-  case RTC_EVENT_ALARM:

-    palTogglePad(GPIOC, GPIOC_LED);

-    chSysLockFromIsr();

-    chBSemSignalI(&alarm_sem);

-    chSysUnlockFromIsr();

-    break;

-  }

-}

-

-int main(void) {

-  msg_t status = RDY_TIMEOUT;

-

-  halInit();

-  chSysInit();

-  chBSemInit(&alarm_sem, TRUE);

-

-  rtcGetTime(&RTCD1, &timespec);

-  alarmspec.tv_sec = timespec.tv_sec + RTC_ALARMPERIOD;

-  rtcSetAlarm(&RTCD1, 0, &alarmspec);

-

-  rtcSetCallback(&RTCD1, my_cb);

-  while (TRUE){

-

-    /* Wait until alarm callback signaled semaphore.*/

-    status = chBSemWaitTimeout(&alarm_sem, S2ST(RTC_ALARMPERIOD + 5));

-

-    if (status == RDY_TIMEOUT){

-      chSysHalt();

-    }

-    else{

-      rtcGetTime(&RTCD1, &timespec);

-      alarmspec.tv_sec = timespec.tv_sec + RTC_ALARMPERIOD;

-      rtcSetAlarm(&RTCD1, 0, &alarmspec);

-    }

-  }

-  return 0;

-}

-#endif /* TEST_ALARM_WAKEUP */

diff --git a/testhal/STM32F1xx/RTC/mcuconf.h b/testhal/STM32F1xx/RTC/mcuconf.h
deleted file mode 100644
index 589b599d4..000000000
--- a/testhal/STM32F1xx/RTC/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   TRUE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_LSE

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             FALSE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  FALSE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F1xx/RTC_FATTIME/Makefile b/testhal/STM32F1xx/RTC_FATTIME/Makefile
deleted file mode 100644
index 347169ba9..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/Makefile
+++ /dev/null
@@ -1,213 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_103STK/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(FATFSSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       $(CHIBIOS)/os/various/chrtclib.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various $(FATFSINC) 

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m3

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F1xx/RTC_FATTIME/chconf.h b/testhal/STM32F1xx/RTC_FATTIME/chconf.h
deleted file mode 100644
index f29e139f7..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/RTC_FATTIME/ffconf.h b/testhal/STM32F1xx/RTC_FATTIME/ffconf.h
deleted file mode 100644
index a4816e845..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/ffconf.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* CHIBIOS FIX */

-#include "ch.h"

-

-/*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file  R0.09  (C)ChaN, 2011

-/----------------------------------------------------------------------------/

-/

-/ CAUTION! Do not forget to make clean the project after any changes to

-/ the configuration options.

-/

-/----------------------------------------------------------------------------*/

-#ifndef _FFCONF

-#define _FFCONF 6502	/* Revision ID */

-

-

-/*---------------------------------------------------------------------------/

-/ Functions and Buffer Configurations

-/----------------------------------------------------------------------------*/

-

-#define	_FS_TINY		0	/* 0:Normal or 1:Tiny */

-/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system

-/  object instead of the sector buffer in the individual file object for file

-/  data transfer. This reduces memory consumption 512 bytes each file object. */

-

-

-#define _FS_READONLY	0	/* 0:Read/Write or 1:Read only */

-/* Setting _FS_READONLY to 1 defines read only configuration. This removes

-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,

-/  f_truncate and useless f_getfree. */

-

-

-#define _FS_MINIMIZE	0	/* 0 to 3 */

-/* The _FS_MINIMIZE option defines minimization level to remove some functions.

-/

-/   0: Full function.

-/   1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename

-/      are removed.

-/   2: f_opendir and f_readdir are removed in addition to 1.

-/   3: f_lseek is removed in addition to 2. */

-

-

-#define	_USE_STRFUNC	0	/* 0:Disable or 1-2:Enable */

-/* To enable string functions, set _USE_STRFUNC to 1 or 2. */

-

-

-#define	_USE_MKFS		1	/* 0:Disable or 1:Enable */

-/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */

-

-

-#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */

-/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */

-

-

-#define	_USE_FASTSEEK	0	/* 0:Disable or 1:Enable */

-/* To enable fast seek feature, set _USE_FASTSEEK to 1. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Locale and Namespace Configurations

-/----------------------------------------------------------------------------*/

-

-#define _CODE_PAGE	1251

-/* The _CODE_PAGE specifies the OEM code page to be used on the target system.

-/  Incorrect setting of the code page can cause a file open failure.

-/

-/   932  - Japanese Shift-JIS (DBCS, OEM, Windows)

-/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)

-/   949  - Korean (DBCS, OEM, Windows)

-/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)

-/   1250 - Central Europe (Windows)

-/   1251 - Cyrillic (Windows)

-/   1252 - Latin 1 (Windows)

-/   1253 - Greek (Windows)

-/   1254 - Turkish (Windows)

-/   1255 - Hebrew (Windows)

-/   1256 - Arabic (Windows)

-/   1257 - Baltic (Windows)

-/   1258 - Vietnam (OEM, Windows)

-/   437  - U.S. (OEM)

-/   720  - Arabic (OEM)

-/   737  - Greek (OEM)

-/   775  - Baltic (OEM)

-/   850  - Multilingual Latin 1 (OEM)

-/   858  - Multilingual Latin 1 + Euro (OEM)

-/   852  - Latin 2 (OEM)

-/   855  - Cyrillic (OEM)

-/   866  - Russian (OEM)

-/   857  - Turkish (OEM)

-/   862  - Hebrew (OEM)

-/   874  - Thai (OEM, Windows)

-/	1    - ASCII only (Valid for non LFN cfg.)

-*/

-

-

-#define	_USE_LFN	1		/* 0 to 3 */

-#define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */

-/* The _USE_LFN option switches the LFN support.

-/

-/   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.

-/   1: Enable LFN with static working buffer on the BSS. Always NOT reentrant.

-/   2: Enable LFN with dynamic working buffer on the STACK.

-/   3: Enable LFN with dynamic working buffer on the HEAP.

-/

-/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN,

-/  Unicode handling functions ff_convert() and ff_wtoupper() must be added

-/  to the project. When enable to use heap, memory control functions

-/  ff_memalloc() and ff_memfree() must be added to the project. */

-

-

-#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */

-/* To switch the character code set on FatFs API to Unicode,

-/  enable LFN feature and set _LFN_UNICODE to 1. */

-

-

-#define _FS_RPATH		0	/* 0 to 2 */

-/* The _FS_RPATH option configures relative path feature.

-/

-/   0: Disable relative path feature and remove related functions.

-/   1: Enable relative path. f_chdrive() and f_chdir() are available.

-/   2: f_getcwd() is available in addition to 1.

-/

-/  Note that output of the f_readdir fnction is affected by this option. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Physical Drive Configurations

-/----------------------------------------------------------------------------*/

-

-#define _VOLUMES	1

-/* Number of volumes (logical drives) to be used. */

-

-

-#define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */

-/* Maximum sector size to be handled.

-/  Always set 512 for memory card and hard disk but a larger value may be

-/  required for on-board flash memory, floppy disk and optical disk.

-/  When _MAX_SS is larger than 512, it configures FatFs to variable sector size

-/  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */

-

-

-#define	_MULTI_PARTITION	0	/* 0:Single partition, 1/2:Enable multiple partition */

-/* When set to 0, each volume is bound to the same physical drive number and

-/ it can mount only first primaly partition. When it is set to 1, each volume

-/ is tied to the partitions listed in VolToPart[]. */

-

-

-#define	_USE_ERASE	1	/* 0:Disable or 1:Enable */

-/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command

-/  should be added to the disk_ioctl functio. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ System Configurations

-/----------------------------------------------------------------------------*/

-

-#define _WORD_ACCESS	1	/* 0 or 1 */

-/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS

-/  option defines which access method is used to the word data on the FAT volume.

-/

-/   0: Byte-by-byte access.

-/   1: Word access. Do not choose this unless following condition is met.

-/

-/  When the byte order on the memory is big-endian or address miss-aligned word

-/  access results incorrect behavior, the _WORD_ACCESS must be set to 0.

-/  If it is not the case, the value can also be set to 1 to improve the

-/  performance and code size.

-*/

-

-

-/* A header file that defines sync object types on the O/S, such as

-/  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */

-

-#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */

-#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */

-#define	_SYNC_t			Semaphore * /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */

-

-/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.

-/

-/   0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect.

-/   1: Enable reentrancy. Also user provided synchronization handlers,

-/      ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj

-/      function must be added to the project. */

-

-

-#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */

-/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value

-   defines how many files can be opened simultaneously. */

-

-

-#endif /* _FFCONFIG */

diff --git a/testhal/STM32F1xx/RTC_FATTIME/halconf.h b/testhal/STM32F1xx/RTC_FATTIME/halconf.h
deleted file mode 100644
index 54be7f5e8..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             TRUE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          TRUE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 TRUE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/RTC_FATTIME/main.c b/testhal/STM32F1xx/RTC_FATTIME/main.c
deleted file mode 100644
index c229830d0..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/main.c
+++ /dev/null
@@ -1,570 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <stdio.h>

-#include <string.h>

-#include <time.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "usb_cdc.h"

-#include "shell.h"

-#include "chprintf.h"

-#include "chrtclib.h"

-#include "ff.h"

-

-/*===========================================================================*/

-/* USB related stuff.                                                        */

-/*===========================================================================*/

-

-/*

- * Endpoints to be used for USBD1.

- */

-#define USBD1_DATA_REQUEST_EP           1

-#define USBD1_DATA_AVAILABLE_EP         1

-#define USBD1_INTERRUPT_REQUEST_EP      2

-

-/*

- * Serial over USB Driver structure.

- */

-static SerialUSBDriver SDU1;

-

-/*

- * USB Device Descriptor.

- */

-static const uint8_t vcom_device_descriptor_data[18] = {

-  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */

-                         0x02,          /* bDeviceClass (CDC).              */

-                         0x00,          /* bDeviceSubClass.                 */

-                         0x00,          /* bDeviceProtocol.                 */

-                         0x40,          /* bMaxPacketSize.                  */

-                         0x0483,        /* idVendor (ST).                   */

-                         0x5740,        /* idProduct.                       */

-                         0x0200,        /* bcdDevice.                       */

-                         1,             /* iManufacturer.                   */

-                         2,             /* iProduct.                        */

-                         3,             /* iSerialNumber.                   */

-                         1)             /* bNumConfigurations.              */

-};

-

-/*

- * Device Descriptor wrapper.

- */

-static const USBDescriptor vcom_device_descriptor = {

-  sizeof vcom_device_descriptor_data,

-  vcom_device_descriptor_data

-};

-

-/* Configuration Descriptor tree for a CDC.*/

-static const uint8_t vcom_configuration_descriptor_data[67] = {

-  /* Configuration Descriptor.*/

-  USB_DESC_CONFIGURATION(67,            /* wTotalLength.                    */

-                         0x02,          /* bNumInterfaces.                  */

-                         0x01,          /* bConfigurationValue.             */

-                         0,             /* iConfiguration.                  */

-                         0xC0,          /* bmAttributes (self powered).     */

-                         50),           /* bMaxPower (100mA).               */

-  /* Interface Descriptor.*/

-  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */

-                         0x00,          /* bAlternateSetting.               */

-                         0x01,          /* bNumEndpoints.                   */

-                         0x02,          /* bInterfaceClass (Communications

-                                           Interface Class, CDC section

-                                           4.2).                            */

-                         0x02,          /* bInterfaceSubClass (Abstract

-                                         Control Model, CDC section 4.3).   */

-                         0x01,          /* bInterfaceProtocol (AT commands,

-                                           CDC section 4.4).                */

-                         0),            /* iInterface.                      */

-  /* Header Functional Descriptor (CDC section 5.2.3).*/

-  USB_DESC_BYTE         (5),            /* bLength.                         */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x00),         /* bDescriptorSubtype (Header

-                                           Functional Descriptor.           */

-  USB_DESC_BCD          (0x0110),       /* bcdCDC.                          */

-  /* Call Management Functional Descriptor. */

-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x01),         /* bDescriptorSubtype (Call Management

-                                           Functional Descriptor).          */

-  USB_DESC_BYTE         (0x00),         /* bmCapabilities (D0+D1).          */

-  USB_DESC_BYTE         (0x01),         /* bDataInterface.                  */

-  /* ACM Functional Descriptor.*/

-  USB_DESC_BYTE         (4),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x02),         /* bDescriptorSubtype (Abstract

-                                           Control Management Descriptor).  */

-  USB_DESC_BYTE         (0x02),         /* bmCapabilities.                  */

-  /* Union Functional Descriptor.*/

-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x06),         /* bDescriptorSubtype (Union

-                                           Functional Descriptor).          */

-  USB_DESC_BYTE         (0x00),         /* bMasterInterface (Communication

-                                           Class Interface).                */

-  USB_DESC_BYTE         (0x01),         /* bSlaveInterface0 (Data Class

-                                           Interface).                      */

-  /* Endpoint 2 Descriptor.*/

-  USB_DESC_ENDPOINT     (USB_CDC_INTERRUPT_REQUEST_EP|0x80,

-                         0x03,          /* bmAttributes (Interrupt).        */

-                         0x0008,        /* wMaxPacketSize.                  */

-                         0xFF),         /* bInterval.                       */

-  /* Interface Descriptor.*/

-  USB_DESC_INTERFACE    (0x01,          /* bInterfaceNumber.                */

-                         0x00,          /* bAlternateSetting.               */

-                         0x02,          /* bNumEndpoints.                   */

-                         0x0A,          /* bInterfaceClass (Data Class

-                                           Interface, CDC section 4.5).     */

-                         0x00,          /* bInterfaceSubClass (CDC section

-                                           4.6).                            */

-                         0x00,          /* bInterfaceProtocol (CDC section

-                                           4.7).                            */

-                         0x00),         /* iInterface.                      */

-  /* Endpoint 3 Descriptor.*/

-  USB_DESC_ENDPOINT     (USB_CDC_DATA_AVAILABLE_EP,     /* bEndpointAddress.*/

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00),         /* bInterval.                       */

-  /* Endpoint 1 Descriptor.*/

-  USB_DESC_ENDPOINT     (USB_CDC_DATA_REQUEST_EP|0x80,  /* bEndpointAddress.*/

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00)          /* bInterval.                       */

-};

-

-/*

- * Configuration Descriptor wrapper.

- */

-static const USBDescriptor vcom_configuration_descriptor = {

-  sizeof vcom_configuration_descriptor_data,

-  vcom_configuration_descriptor_data

-};

-

-/*

- * U.S. English language identifier.

- */

-static const uint8_t vcom_string0[] = {

-  USB_DESC_BYTE(4),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */

-};

-

-/*

- * Vendor string.

- */

-static const uint8_t vcom_string1[] = {

-  USB_DESC_BYTE(38),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,

-  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,

-  'c', 0, 's', 0

-};

-

-/*

- * Device Description string.

- */

-static const uint8_t vcom_string2[] = {

-  USB_DESC_BYTE(56),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,

-  'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,

-  'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,

-  'o', 0, 'r', 0, 't', 0

-};

-

-/*

- * Serial Number string.

- */

-static const uint8_t vcom_string3[] = {

-  USB_DESC_BYTE(8),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  '0' + CH_KERNEL_MAJOR, 0,

-  '0' + CH_KERNEL_MINOR, 0,

-  '0' + CH_KERNEL_PATCH, 0

-};

-

-/*

- * Strings wrappers array.

- */

-static const USBDescriptor vcom_strings[] = {

-  {sizeof vcom_string0, vcom_string0},

-  {sizeof vcom_string1, vcom_string1},

-  {sizeof vcom_string2, vcom_string2},

-  {sizeof vcom_string3, vcom_string3}

-};

-

-/*

- * Handles the GET_DESCRIPTOR callback. All required descriptors must be

- * handled here.

- */

-static const USBDescriptor *get_descriptor(USBDriver *usbp,

-                                           uint8_t dtype,

-                                           uint8_t dindex,

-                                           uint16_t lang) {

-

-  (void)usbp;

-  (void)lang;

-  switch (dtype) {

-  case USB_DESCRIPTOR_DEVICE:

-    return &vcom_device_descriptor;

-  case USB_DESCRIPTOR_CONFIGURATION:

-    return &vcom_configuration_descriptor;

-  case USB_DESCRIPTOR_STRING:

-    if (dindex < 4)

-      return &vcom_strings[dindex];

-  }

-  return NULL;

-}

-

-/**

- * @brief   IN EP1 state.

- */

-static USBInEndpointState ep1instate;

-

-/**

- * @brief   OUT EP1 state.

- */

-static USBOutEndpointState ep1outstate;

-

-/**

- * @brief   EP1 initialization structure (both IN and OUT).

- */

-static const USBEndpointConfig ep1config = {

-  USB_EP_MODE_TYPE_BULK,

-  NULL,

-  sduDataTransmitted,

-  sduDataReceived,

-  0x0040,

-  0x0040,

-  &ep1instate,

-  &ep1outstate,

-  1,

-  NULL

-};

-

-/**

- * @brief   IN EP2 state.

- */

-static USBInEndpointState ep2instate;

-

-/**

- * @brief   EP2 initialization structure (IN only).

- */

-static const USBEndpointConfig ep2config = {

-  USB_EP_MODE_TYPE_INTR,

-  NULL,

-  sduInterruptTransmitted,

-  NULL,

-  0x0010,

-  0x0000,

-  &ep2instate,

-  NULL,

-  1,

-  NULL

-};

-

-/*

- * Handles the USB driver global events.

- */

-static void usb_event(USBDriver *usbp, usbevent_t event) {

-

-  switch (event) {

-  case USB_EVENT_RESET:

-    return;

-  case USB_EVENT_ADDRESS:

-    return;

-  case USB_EVENT_CONFIGURED:

-    chSysLockFromIsr();

-

-    /* Enables the endpoints specified into the configuration.

-       Note, this callback is invoked from an ISR so I-Class functions

-       must be used.*/

-    usbInitEndpointI(usbp, USB_CDC_DATA_REQUEST_EP, &ep1config);

-    usbInitEndpointI(usbp, USB_CDC_INTERRUPT_REQUEST_EP, &ep2config);

-

-    /* Resetting the state of the CDC subsystem.*/

-    sduConfigureHookI(&SDU1);

-

-    chSysUnlockFromIsr();

-    return;

-  case USB_EVENT_SUSPEND:

-    return;

-  case USB_EVENT_WAKEUP:

-    return;

-  case USB_EVENT_STALLED:

-    return;

-  }

-  return;

-}

-

-/*

- * USB driver configuration.

- */

-static const USBConfig usbcfg = {

-  usb_event,

-  get_descriptor,

-  sduRequestsHook,

-  NULL

-};

-

-/*

- * Serial over USB driver configuration.

- */

-static const SerialUSBConfig serusbcfg = {

-  &USBD1,

-  USBD1_DATA_REQUEST_EP,

-  USBD1_DATA_AVAILABLE_EP,

-  USBD1_INTERRUPT_REQUEST_EP

-};

-

-/**

- * @brief FS object.

- */

-FATFS MMC_FS;

-

-/**

- * MMC driver instance.

- */

-MMCDriver MMCD1;

-

-/* FS mounted and ready.*/

-static bool_t fs_ready = FALSE;

-

-/* Maximum speed SPI configuration (18MHz, CPHA=0, CPOL=0, MSb first).*/

-static SPIConfig hs_spicfg = {NULL, IOPORT2, GPIOB_SPI2NSS, 0};

-

-/* Low speed SPI configuration (281.250kHz, CPHA=0, CPOL=0, MSb first).*/

-static SPIConfig ls_spicfg = {NULL, IOPORT2, GPIOB_SPI2NSS,

-                              SPI_CR1_BR_2 | SPI_CR1_BR_1};

-

-/* MMC/SD over SPI driver configuration.*/

-static MMCConfig mmccfg = {&SPID2, &ls_spicfg, &hs_spicfg};

-

-/**

- *

- */

-bool_t mmc_lld_is_write_protected(MMCDriver *sdcp) {

-  (void)sdcp;

-  return FALSE;

-}

-

-/**

- *

- */

-bool_t mmc_lld_is_card_inserted(MMCDriver *sdcp) {

-  (void)sdcp;

-  return !palReadPad(GPIOC, GPIOC_MMCCP);

-}

-

-/**

- *

- */

-void cmd_sdiotest(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argc;

-  (void)argv;

-  FRESULT err;

-  uint32_t clusters;

-  FATFS *fsp;

-  FIL FileObject;

-  //FILINFO FileInfo;

-  size_t bytes_written;

-  struct tm timp;

-

-  // set time to 2011-03-13 07:06:40

-  //rtcSetTimeUnixSec(&RTCD1, 1300000000);

-

-#if !HAL_USE_RTC

-  chprintf(chp, "ERROR! Chibios compiled without RTC support.");

-  chprintf(chp, "Enable HAL_USE_RCT in you halconf.h");

-  chThdSleepMilliseconds(100);

-  return;

-#endif

-

-  chprintf(chp, "Trying to connect SDIO... ");

-  chThdSleepMilliseconds(100);

-

-  if (!mmcConnect(&MMCD1)) {

-    chprintf(chp, "OK\r\n");

-    chprintf(chp, "Register working area for filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_mount(0, &MMC_FS);

-    if (err != FR_OK){

-      chSysHalt();

-    }

-    else{

-      fs_ready = TRUE;

-      chprintf(chp, "OK\r\n");

-    }

-

-    chprintf(chp, "Mounting filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_getfree("/", &clusters, &fsp);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-    chprintf(chp,

-             "FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",

-             clusters, (uint32_t)MMC_FS.csize,

-             clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);

-

-    rtcGetTimeTm(&RTCD1, &timp);

-    chprintf(chp, "Current RTC time is: ");

-    chprintf(chp, "%u-%u-%u %u:%u:%u\r\n",

-      timp.tm_year+1900, timp.tm_mon+1, timp.tm_mday, timp.tm_hour, timp.tm_min,

-      timp.tm_sec);

-

-    chprintf(chp, "Creating empty file 'tmstmp.tst'... ");

-    chThdSleepMilliseconds(100);

-    err = f_open(&FileObject, "0:tmstmp.tst", FA_WRITE | FA_OPEN_ALWAYS);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Write some data in it... ");

-    chThdSleepMilliseconds(100);

-    err = f_write(&FileObject, "tst", sizeof("tst"), (void *)&bytes_written);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Closing file 'tmstmp.tst'... ");

-    chThdSleepMilliseconds(100);

-    err = f_close(&FileObject);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

-

-//    chprintf(chp, "Obtaining file info ... ");

-//    chThdSleepMilliseconds(100);

-//    err = f_stat("0:tmstmp.tst", &FileInfo);

-//    if (err != FR_OK) {

-//      chSysHalt();

-//    }

-//    else{

-//      chprintf(chp, "OK\r\n");

-//      chprintf(chp, "    Timestamp: %u-%u-%u %u:%u:%u\r\n",

-//                         ((FileInfo.fdate >> 9) & 127) + 1980,

-//                         (FileInfo.fdate >> 5) & 15,

-//                         FileInfo.fdate & 31,

-//                         (FileInfo.ftime >> 11) & 31,

-//                         (FileInfo.ftime >> 5) & 63,

-//                         (FileInfo.ftime & 31) * 2);

-//    }

-

-    chprintf(chp, "Umounting filesystem... ");

-    f_mount(0, NULL);

-    chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Disconnecting from SDIO...");

-    chThdSleepMilliseconds(100);

-    if (mmcDisconnect(&MMCD1))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-    chprintf(chp, "------------------------------------------------------\r\n");

-    chprintf(chp, "Now you can remove memory card and check timestamp on PC.\r\n");

-    chThdSleepMilliseconds(100);

-  }

-  else{

-    chSysHalt();

-  }

-}

-

-/*===========================================================================*/

-/* Command line related.                                                     */

-/*===========================================================================*/

-

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-

-static const ShellCommand commands[] = {

-  {"sdiotest", cmd_sdiotest},

-  {NULL, NULL}

-};

-

-static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream *)&SDU1,

-  commands

-};

-

-/*===========================================================================*/

-/* Generic code.                                                             */

-/*===========================================================================*/

-

-/*

- * Application entry point.

- */

-int main(void) {

-  Thread *shelltp = NULL;

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes a serial-over-USB CDC driver.

-   */

-  sduObjectInit(&SDU1);

-  sduStart(&SDU1, &serusbcfg);

-

-  /*

-   * Activates the USB driver and then the USB bus pull-up on D+.

-   * Note, a delay is inserted in order to not have to disconnect the cable

-   * after a reset.

-   */

-  usbDisconnectBus(serusbcfg.usbp);

-  chThdSleepMilliseconds(1000);

-  usbStart(serusbcfg.usbp, &usbcfg);

-  usbConnectBus(serusbcfg.usbp);

-  chThdSleepMilliseconds(100);

-

-  /*

-   * Shell manager initialization.

-   */

-  shellInit();

-

-  /*

-   * Initializes the SDIO drivers.

-   */

-  mmcObjectInit(&MMCD1);

-  mmcStart(&MMCD1, &mmccfg);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing except

-   * sleeping in a loop and check the button state.

-   */

-  while (TRUE) {

-    if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))

-      shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

-    else if (chThdTerminated(shelltp)) {

-      chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

-      shelltp = NULL;           /* Triggers spawning of a new shell.        */

-    }

-  chThdSleepMilliseconds(1000);

-}

-

-}

diff --git a/testhal/STM32F1xx/RTC_FATTIME/mcuconf.h b/testhal/STM32F1xx/RTC_FATTIME/mcuconf.h
deleted file mode 100644
index 6c437d356..000000000
--- a/testhal/STM32F1xx/RTC_FATTIME/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  TRUE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F1xx/SDC/Makefile b/testhal/STM32F1xx/SDC/Makefile
deleted file mode 100644
index 4e25ee845..000000000
--- a/testhal/STM32F1xx/SDC/Makefile
+++ /dev/null
@@ -1,212 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM3210E_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

-include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xE.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m3

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F1xx/SDC/chconf.h b/testhal/STM32F1xx/SDC/chconf.h
deleted file mode 100644
index 2e6fcc6ee..000000000
--- a/testhal/STM32F1xx/SDC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/SDC/halconf.h b/testhal/STM32F1xx/SDC/halconf.h
deleted file mode 100644
index 3f22f8d9c..000000000
--- a/testhal/STM32F1xx/SDC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/SDC/main.c b/testhal/STM32F1xx/SDC/main.c
deleted file mode 100644
index 24a8d4346..000000000
--- a/testhal/STM32F1xx/SDC/main.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * SDIO configuration.

- */

-static const SDCConfig sdccfg = {

-  0

-};

-

-static uint8_t blkbuf[MMCSD_BLOCK_SIZE * 4 + 1];

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Initializes the SDIO drivers.

-   */

-  sdcStart(&SDCD1, &sdccfg);

-  if (!sdcConnect(&SDCD1)) {

-    int i;

-

-    /* Single aligned read.*/

-    if (sdcRead(&SDCD1, 0, blkbuf, 1))

-      chSysHalt();

-

-    /* Single unaligned read.*/

-    if (sdcRead(&SDCD1, 0, blkbuf + 1, 1))

-      chSysHalt();

-

-    /* Multiple aligned read.*/

-    if (sdcRead(&SDCD1, 0, blkbuf, 4))

-      chSysHalt();

-

-    /* Multiple unaligned read.*/

-    if (sdcRead(&SDCD1, 0, blkbuf + 1, 4))

-      chSysHalt();

-

-    /* Repeated multiple aligned reads.*/

-    for (i = 0; i < 1000; i++) {

-      if (sdcRead(&SDCD1, 0, blkbuf, 4))

-        chSysHalt();

-    }

-

-    /* Repeated multiple unaligned reads.*/

-    for (i = 0; i < 1000; i++) {

-      if (sdcRead(&SDCD1, 0, blkbuf + 1, 4))

-        chSysHalt();

-    }

-

-    /* Repeated multiple aligned writes.*/

-    for (i = 0; i < 100; i++) {

-      if (sdcRead(&SDCD1, 0x10000, blkbuf, 4))

-        chSysHalt();

-      if (sdcWrite(&SDCD1, 0x10000, blkbuf, 4))

-        chSysHalt();

-      if (sdcWrite(&SDCD1, 0x10000, blkbuf, 4))

-        chSysHalt();

-    }

-

-    /* Repeated multiple unaligned writes.*/

-    for (i = 0; i < 100; i++) {

-      if (sdcRead(&SDCD1, 0x10000, blkbuf + 1, 4))

-        chSysHalt();

-      if (sdcWrite(&SDCD1, 0x10000, blkbuf + 1, 4))

-        chSysHalt();

-      if (sdcWrite(&SDCD1, 0x10000, blkbuf + 1, 4))

-        chSysHalt();

-    }

-

-    if (sdcDisconnect(&SDCD1))

-      chSysHalt();

-  }

-

-  /*

-   * Normal main() thread activity.

-   */

-  while (TRUE) {

-    chThdSleepMilliseconds(500);

-  }

-}

diff --git a/testhal/STM32F1xx/SDC/mcuconf.h b/testhal/STM32F1xx/SDC/mcuconf.h
deleted file mode 100644
index b506af317..000000000
--- a/testhal/STM32F1xx/SDC/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  FALSE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F1xx/SDC/readme.txt b/testhal/STM32F1xx/SDC/readme.txt
deleted file mode 100644
index b897676af..000000000
--- a/testhal/STM32F1xx/SDC/readme.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SDC driver demo for STM32.                             **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Olimex ST_STM3210E_EVAL board.

-

-** The Demo **

-

-The application demonstrates the use of the STM32 SDC driver.

-

-** Build Procedure **

-

-The demo has been tested using the free Codesourcery GCC-based toolchain

-and YAGARTO.

-Just modify the TRGT line in the makefile in order to use different GCC ports.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-Also note that not all the files present in the ST library are distributed

-with ChibiOS/RT, you can find the whole library on the ST web site:

-

-                             http://www.st.com

diff --git a/testhal/SPC560Pxx/PWM-ICU/.cproject b/testhal/STM32F1xx/SPI/.cproject
index 18c26cafe..09884e9c6 100644
--- a/testhal/SPC560Pxx/PWM-ICU/.cproject
+++ b/testhal/STM32F1xx/SPI/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.1369345018">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1369345018" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.1449408486">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1449408486" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1369345018" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.1369345018." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1823023415" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1823023415.859203435" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.2144664825" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1509533538" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1597619528" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1283370538" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1449408486" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1449408486." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1640110688" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1640110688.768918987" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.932365621" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.387204190" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.226999148" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1298611053" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.802256572" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1714507025" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.2106331259" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.627349891" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.867090134" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1980093876" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1736784139" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1756895547" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,11 +39,11 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC560Pxx-PWM-ICU.null.1141335251" name="SPC560Pxx-PWM-ICU"/>

+		<project id="STM32F1xx-SPI.null.1926193997" name="STM32F1xx-SPI"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.1369345018">

+		<scannerConfigBuildInfo instanceId="0.1449408486">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

diff --git a/testhal/STM32F1xx/SPI/.project b/testhal/STM32F1xx/SPI/.project
new file mode 100644
index 000000000..427a9f4a5
--- /dev/null
+++ b/testhal/STM32F1xx/SPI/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>STM32F1xx-SPI</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/testhal/STM32F1xx/SPI/Makefile b/testhal/STM32F1xx/SPI/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/SPI/Makefile
+++ b/testhal/STM32F1xx/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/SPI/chconf.h b/testhal/STM32F1xx/SPI/chconf.h
index 2e6fcc6ee..49a557804 100644
--- a/testhal/STM32F1xx/SPI/chconf.h
+++ b/testhal/STM32F1xx/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/SPI/halconf.h b/testhal/STM32F1xx/SPI/halconf.h
index 3e1cafbbf..5782fe449 100644
--- a/testhal/STM32F1xx/SPI/halconf.h
+++ b/testhal/STM32F1xx/SPI/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -78,6 +71,12 @@
 #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

 #define HAL_USE_I2C                 FALSE

 #endif

+/**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

 

 /**

  * @brief   Enables the ICU subsystem.

diff --git a/testhal/STM32F1xx/SPI/main.c b/testhal/STM32F1xx/SPI/main.c
index 35b7c3b42..674d5d284 100644
--- a/testhal/STM32F1xx/SPI/main.c
+++ b/testhal/STM32F1xx/SPI/main.c
@@ -46,10 +46,11 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

+static THD_FUNCTION(spi_thread_1, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 1");

   while (TRUE) {

     spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

@@ -67,10 +68,11 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

+static THD_FUNCTION(spi_thread_2, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 2");

   while (TRUE) {

     spiAcquireBus(&SPID1);              /* Acquire ownership of the bus.    */

diff --git a/testhal/STM32F1xx/SPI/mcuconf.h b/testhal/STM32F1xx/SPI/mcuconf.h
index c74814336..5de132afa 100644
--- a/testhal/STM32F1xx/SPI/mcuconf.h
+++ b/testhal/STM32F1xx/SPI/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC560Dxx/SPI/.cproject b/testhal/STM32F1xx/UART/.cproject
index a4ae17c6d..f3228a9e5 100644
--- a/testhal/SPC560Dxx/SPI/.cproject
+++ b/testhal/STM32F1xx/UART/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.1905402074">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1905402074" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1905402074" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1905402074." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1772628771" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1772628771.1012310025" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1504853834" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.2108513343" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1963635577" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1229498027" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.968581684" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2110547919" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.733455710" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.376944016" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,11 +39,11 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-SPI.null.1461388361" name="SPC563Mxx-SPI"/>

+		<project id="STM32F1xx-UART.null.386762278" name="STM32F1xx-UART"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

+		<scannerConfigBuildInfo instanceId="0.1905402074">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

diff --git a/testhal/STM32F1xx/UART/.project b/testhal/STM32F1xx/UART/.project
new file mode 100644
index 000000000..dae6d5690
--- /dev/null
+++ b/testhal/STM32F1xx/UART/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>STM32F1xx-UART</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

+			<triggers>clean,full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

+			<triggers>full,incremental,</triggers>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.cdt.core.cnature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

+	</natures>

+	<linkedResources>

+		<link>

+			<name>os</name>

+			<type>2</type>

+			<locationURI>CHIBIOS/os</locationURI>

+		</link>

+	</linkedResources>

+</projectDescription>

diff --git a/testhal/STM32F1xx/UART/Makefile b/testhal/STM32F1xx/UART/Makefile
index 0f7e20317..59c540dfd 100644
--- a/testhal/STM32F1xx/UART/Makefile
+++ b/testhal/STM32F1xx/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/UART/chconf.h b/testhal/STM32F1xx/UART/chconf.h
index 2e6fcc6ee..49a557804 100644
--- a/testhal/STM32F1xx/UART/chconf.h
+++ b/testhal/STM32F1xx/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/UART/halconf.h b/testhal/STM32F1xx/UART/halconf.h
index 520e71b0a..e9b103442 100644
--- a/testhal/STM32F1xx/UART/halconf.h
+++ b/testhal/STM32F1xx/UART/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/UART/main.c b/testhal/STM32F1xx/UART/main.c
index 5682b8029..526125df2 100644
--- a/testhal/STM32F1xx/UART/main.c
+++ b/testhal/STM32F1xx/UART/main.c
@@ -17,20 +17,21 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt1, vt2;

+static virtual_timer_t vt1, vt2;

 

 static void restart(void *p) {

 

   (void)p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   uartStartSendI(&UARTD2, 14, "Hello World!\r\n");

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static void ledoff(void *p) {

 

   (void)p;

+

   palSetPad(IOPORT3, GPIOC_LED);

 }

 

@@ -41,6 +42,7 @@ static void ledoff(void *p) {
 static void txend1(UARTDriver *uartp) {

 

   (void)uartp;

+

   palClearPad(IOPORT3, GPIOC_LED);

 }

 

@@ -50,12 +52,12 @@ static void txend1(UARTDriver *uartp) {
 static void txend2(UARTDriver *uartp) {

 

   (void)uartp;

+

   palSetPad(IOPORT3, GPIOC_LED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt1))

-    chVTResetI(&vt1);

-  chVTSetI(&vt1, MS2ST(5000), restart, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt1);

+  chVTDoSetI(&vt1, MS2ST(5000), restart, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

@@ -76,13 +78,13 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
 

   (void)uartp;

   (void)c;

+

   /* Flashing the LED each time a character is received.*/

   palClearPad(IOPORT3, GPIOC_LED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt2))

-    chVTResetI(&vt2);

-  chVTSetI(&vt2, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt2);

+  chVTDoSetI(&vt2, MS2ST(200), ledoff, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32F1xx/UART/mcuconf.h b/testhal/STM32F1xx/UART/mcuconf.h
index 05ad2de0d..10c0684ee 100644
--- a/testhal/STM32F1xx/UART/mcuconf.h
+++ b/testhal/STM32F1xx/UART/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC560Pxx/SPI/.cproject b/testhal/STM32F1xx/USB_CDC/.cproject
index a4ae17c6d..e949fc6a0 100644
--- a/testhal/SPC560Pxx/SPI/.cproject
+++ b/testhal/STM32F1xx/USB_CDC/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.1922075512">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1922075512" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1922075512" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1922075512." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.111699162" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.111699162.301268821" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.471952890" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.982141991" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1529793173" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1150867518" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1078155597" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1481798997" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.324881383" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.838278847" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,11 +39,11 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-SPI.null.1461388361" name="SPC563Mxx-SPI"/>

+		<project id="STM32F1xx-USB_CDC.null.352619573" name="STM32F1xx-USB_CDC"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

+		<scannerConfigBuildInfo instanceId="0.1922075512">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

diff --git a/testhal/SPC563Mxx/ADC/.project b/testhal/STM32F1xx/USB_CDC/.project
index ff4e5ffca..cf2fef72d 100644
--- a/testhal/SPC563Mxx/ADC/.project
+++ b/testhal/STM32F1xx/USB_CDC/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>SPC563Mxx-ADC</name>

+	<name>STM32F1xx-USB_CDC</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -25,14 +25,14 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

+			<name>os</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC563M</locationURI>

+			<locationURI>CHIBIOS/os</locationURI>

 		</link>

 		<link>

-			<name>os</name>

+			<name>test</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/os</locationURI>

+			<locationURI>CHIBIOS/test</locationURI>

 		</link>

 	</linkedResources>

 </projectDescription>

diff --git a/testhal/STM32F1xx/USB_CDC/Makefile b/testhal/STM32F1xx/USB_CDC/Makefile
index 0c781d14c..1f9924734 100644
--- a/testhal/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32F1xx/USB_CDC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P103/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        $(CHIBIOS)/os/various/shell.c \

@@ -109,7 +133,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -134,6 +158,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +179,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +201,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F1xx/USB_CDC/chconf.h b/testhal/STM32F1xx/USB_CDC/chconf.h
index 2e6fcc6ee..49a557804 100644
--- a/testhal/STM32F1xx/USB_CDC/chconf.h
+++ b/testhal/STM32F1xx/USB_CDC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F1xx/USB_CDC/halconf.h b/testhal/STM32F1xx/USB_CDC/halconf.h
index cd76b0cfe..09a9a0cdb 100644
--- a/testhal/STM32F1xx/USB_CDC/halconf.h
+++ b/testhal/STM32F1xx/USB_CDC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/USB_CDC/main.c b/testhal/STM32F1xx/USB_CDC/main.c
index 8b11e7ed4..38dc09260 100644
--- a/testhal/STM32F1xx/USB_CDC/main.c
+++ b/testhal/STM32F1xx/USB_CDC/main.c
@@ -285,7 +285,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   case USB_EVENT_ADDRESS:

     return;

   case USB_EVENT_CONFIGURED:

-    chSysLockFromIsr();

+    chSysLockFromISR();

 

     /* Enables the endpoints specified into the configuration.

        Note, this callback is invoked from an ISR so I-Class functions

@@ -296,7 +296,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Resetting the state of the CDC subsystem.*/

     sduConfigureHookI(&SDU1);

 

-    chSysUnlockFromIsr();

+    chSysUnlockFromISR();

     return;

   case USB_EVENT_SUSPEND:

     return;

@@ -332,8 +332,8 @@ static const SerialUSBConfig serusbcfg = {
 /* Command line related.                                                     */

 /*===========================================================================*/

 

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-#define TEST_WA_SIZE    THD_WA_SIZE(256)

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

   size_t n, size;

@@ -350,34 +350,34 @@ 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};

-  Thread *tp;

+  static const char *states[] = {CH_STATE_NAMES};

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: threads\r\n");

     return;

   }

-  chprintf(chp, "    addr    stack prio refs     state time\r\n");

+  chprintf(chp, "    addr    stack prio refs     state\r\n");

   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]);

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }

 

 static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: test\r\n");

     return;

   }

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),

+  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

                            TestThread, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory\r\n");

@@ -437,8 +437,8 @@ static const ShellConfig shell_cfg1 = {
 /*

  * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

   chRegSetThreadName("blinker");

@@ -455,7 +455,7 @@ static msg_t Thread1(void *arg) {
  * Application entry point.

  */

 int main(void) {

-  Thread *shelltp = NULL;

+  thread_t *shelltp = NULL;

 

   /*

    * System initializations.

@@ -500,7 +500,7 @@ int main(void) {
   while (TRUE) {

     if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))

       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

-    else if (chThdTerminated(shelltp)) {

+    else if (chThdTerminatedX(shelltp)) {

       chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

       shelltp = NULL;           /* Triggers spawning of a new shell.        */

     }

diff --git a/testhal/STM32F1xx/USB_CDC/mcuconf.h b/testhal/STM32F1xx/USB_CDC/mcuconf.h
index ba73e46b0..3d82f8d46 100644
--- a/testhal/STM32F1xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32F1xx/USB_CDC/mcuconf.h
@@ -102,12 +102,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -173,7 +173,7 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

  * UART driver system settings.

@@ -187,7 +187,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/USB_CDC_F107/Makefile b/testhal/STM32F1xx/USB_CDC_F107/Makefile
index 9b861f6d3..8edd271fb 100644
--- a/testhal/STM32F1xx/USB_CDC_F107/Makefile
+++ b/testhal/STM32F1xx/USB_CDC_F107/Makefile
@@ -64,7 +64,7 @@ include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F107xC.ld

diff --git a/testhal/STM32F1xx/USB_CDC_F107/halconf.h b/testhal/STM32F1xx/USB_CDC_F107/halconf.h
index cd76b0cfe..bb8ebc123 100644
--- a/testhal/STM32F1xx/USB_CDC_F107/halconf.h
+++ b/testhal/STM32F1xx/USB_CDC_F107/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F1xx/USB_MSC/chconf.h b/testhal/STM32F1xx/USB_MSC/chconf.h
deleted file mode 100644
index f943ea80c..000000000
--- a/testhal/STM32F1xx/USB_MSC/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/USB_MSC/halconf.h b/testhal/STM32F1xx/USB_MSC/halconf.h
deleted file mode 100644
index 2d8f40004..000000000
--- a/testhal/STM32F1xx/USB_MSC/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             TRUE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 TRUE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F1xx/USB_MSC/main.c b/testhal/STM32F1xx/USB_MSC/main.c
deleted file mode 100644
index c8e350596..000000000
--- a/testhal/STM32F1xx/USB_MSC/main.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "test.h"

-

-#include "usb_msc.h"

-

-/*===========================================================================*/

-/* USB related stuff.                                                        */

-/*===========================================================================*/

-

-/*

- * USB Device Descriptor.

- */

-static const uint8_t msc_device_descriptor_data[18] = {

-  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */

-                         0x00,          /* bDeviceClass (in interface).     */

-                         0x00,          /* bDeviceSubClass.                 */

-                         0x00,          /* bDeviceProtocol.                 */

-                         0x40,          /* bMaxPacketSize.                  */

-                         0x0483,        /* idVendor (ST).                   */

-                         0x2004,        /* idProduct.                       */

-                         0x0200,        /* bcdDevice.                       */

-                         1,             /* iManufacturer.                   */

-                         2,             /* iProduct.                        */

-                         3,             /* iSerialNumber.                   */

-                         1)             /* bNumConfigurations.              */

-};

-

-/*

- * Device Descriptor wrapper.

- */

-static const USBDescriptor msc_device_descriptor = {

-  sizeof msc_device_descriptor_data,

-  msc_device_descriptor_data

-};

-

-/* Configuration Descriptor tree for a CDC.*/

-static const uint8_t msc_configuration_descriptor_data[32] = {

-  /* Configuration Descriptor.*/

-  USB_DESC_CONFIGURATION(32,            /* wTotalLength.                    */

-                         0x01,          /* bNumInterfaces.                  */

-                         0x01,          /* bConfigurationValue.             */

-                         0,             /* iConfiguration.                  */

-                         0xC0,          /* bmAttributes (self powered).     */

-                         50),           /* bMaxPower (100mA).               */

-  /* Interface Descriptor.*/

-  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */

-                         0x00,          /* bAlternateSetting.               */

-                         0x02,          /* bNumEndpoints.                   */

-                         0x08,          /* bInterfaceClass (Mass Stprage).  */

-                         0x06,          /* bInterfaceSubClass (SCSI

-                                           transparent command set, MSCO

-                                           chapter 2).                      */

-                         0x50,          /* bInterfaceProtocol (Bulk-Only

-                                            Mass Storage, MSCO chapter 3).  */

-                         4),            /* iInterface.                      */

-  /* Endpoint 1 Descriptor.*/

-  USB_DESC_ENDPOINT     (MSC_DATA_IN_EP|0x80,   /* bEndpointAddress.        */

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00),         /* bInterval (ignored for bulk).    */

-  /* Endpoint 2 Descriptor.*/

-  USB_DESC_ENDPOINT     (MSC_DATA_OUT_EP,       /* bEndpointAddress.        */

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00),         /* bInterval (ignored for bulk).    */

-};

-

-/*

- * Configuration Descriptor wrapper.

- */

-static const USBDescriptor msc_configuration_descriptor = {

-  sizeof msc_configuration_descriptor_data,

-  msc_configuration_descriptor_data

-};

-

-/*

- * U.S. English language identifier.

- */

-static const uint8_t msc_string0[] = {

-  USB_DESC_BYTE(4),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */

-};

-

-/*

- * Vendor string.

- */

-static const uint8_t msc_string1[] = {

-  USB_DESC_BYTE(38),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,

-  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,

-  'c', 0, 's', 0

-};

-

-/*

- * Device Description string.

- */

-static const uint8_t msc_string2[] = {

-  USB_DESC_BYTE(50),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,

-  'R', 0, 'T', 0, ' ', 0, 'M', 0, 'a', 0, 's', 0, 's', 0, ' ', 0,

-  'S', 0, 't', 0, 'o', 0, 'r', 0, 'a', 0, 'g', 0, 'e', 0

-};

-

-/*

- * Serial Number string.

- */

-static const uint8_t msc_string3[] = {

-  USB_DESC_BYTE(8),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  '0' + CH_KERNEL_MAJOR, 0,

-  '0' + CH_KERNEL_MINOR, 0,

-  '0' + CH_KERNEL_PATCH, 0

-};

-

-/*

- * Interface string.

- */

-static const uint8_t msc_string4[] = {

-  16,                               /* bLength.                             */

-  USB_DESCRIPTOR_STRING,            /* bDescriptorType.                     */

-  'S', 0, 'T', 0, ' ', 0, 'M', 0, 'a', 0, 's', 0, 's', 0

-};

-

-/*

- * Strings wrappers array.

- */

-static const USBDescriptor msc_strings[] = {

-  {sizeof msc_string0, msc_string0},

-  {sizeof msc_string1, msc_string1},

-  {sizeof msc_string2, msc_string2},

-  {sizeof msc_string3, msc_string3},

-  {sizeof msc_string4, msc_string4}

-};

-

-/*

- * Handles the GET_DESCRIPTOR callback. All required descriptors must be

- * handled here.

- */

-static const USBDescriptor *get_descriptor(USBDriver *usbp,

-                                           uint8_t dtype,

-                                           uint8_t dindex,

-                                           uint16_t lang) {

-

-  (void)usbp;

-  (void)lang;

-  switch (dtype) {

-  case USB_DESCRIPTOR_DEVICE:

-    return &msc_device_descriptor;

-  case USB_DESCRIPTOR_CONFIGURATION:

-    return &msc_configuration_descriptor;

-  case USB_DESCRIPTOR_STRING:

-    if (dindex < 5)

-      return &msc_strings[dindex];

-  }

-  return NULL;

-}

-

-/*

- * IN EP1 state.

- */

-USBInEndpointState ep1state;

-

-/*

- * OUT EP2 state.

- */

-USBOutEndpointState ep2state;

-

-/*

- * EP1 initialization structure (IN only).

- */

-static const USBEndpointConfig ep1config = {

-  USB_EP_MODE_TYPE_BULK | USB_EP_MODE_TRANSACTION,

-  mscDataTransmitted,

-  NULL,

-  0x0040,

-  0x0000,

-  &ep1state,

-  NULL

-};

-

-/*

- * EP2 initialization structure (OUT only).

- */

-static const USBEndpointConfig ep2config = {

-  USB_EP_MODE_TYPE_BULK | USB_EP_MODE_TRANSACTION,

-  NULL,

-  mscDataReceived,

-  0x0000,

-  0x0040,

-  NULL,

-  &ep2state

-};

-

-/*

- * Handles the USB driver global events.

- */

-static void usb_event(USBDriver *usbp, usbevent_t event) {

-

-  switch (event) {

-  case USB_EVENT_RESET:

-    return;

-  case USB_EVENT_ADDRESS:

-    return;

-  case USB_EVENT_CONFIGURED:

-    /* Enables the endpoints specified into the configuration.

-       Note, this callback is invoked from an ISR so I-Class functions

-       must be used.*/

-    chSysLockFromIsr();

-    usbInitEndpointI(usbp, MSC_DATA_IN_EP, &ep1config);

-    usbInitEndpointI(usbp, MSC_DATA_OUT_EP, &ep2config);

-    chSysUnlockFromIsr();

-    return;

-  case USB_EVENT_SUSPEND:

-    return;

-  case USB_EVENT_WAKEUP:

-    return;

-  case USB_EVENT_STALLED:

-    return;

-  }

-  return;

-}

-

-/*

- * Serial over USB driver configuration.

- */

-static const USBConfig usbcfg = {

-  usb_event,

-  get_descriptor,

-  mscRequestsHook,

-  NULL

-};

-

-/*===========================================================================*/

-/* Generic code.                                                             */

-/*===========================================================================*/

-

-/*

- * Red LED blinker thread, times are in milliseconds.

- */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

-

-  (void)arg;

-  chRegSetThreadName("blinker");

-  while (TRUE) {

-    palClearPad(IOPORT3, GPIOC_LED);

-    chThdSleepMilliseconds(500);

-    palSetPad(IOPORT3, GPIOC_LED);

-    chThdSleepMilliseconds(500);

-  }

-}

-

-/*

- * Application entry point.

- */

-int main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * Activates the USB driver and then the USB bus pull-up on D+.

-   */

-  usbStart(&USBD1, &usbcfg);

-  palClearPad(GPIOC, GPIOC_USB_DISC);

-

-  /*

-   * Activates the serial driver 2 using the driver default configuration.

-   */

-  sdStart(&SD2, NULL);

-

-  /*

-   * Creates the blinker thread.

-   */

-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

-

-  /*

-   * Normal main() thread activity, in this demo it does nothing except

-   * sleeping in a loop and check the button state.

-   */

-  while (TRUE) {

-    if (palReadPad(IOPORT1, GPIOA_BUTTON))

-      TestThread(&SD2);

-    chThdSleepMilliseconds(1000);

-  }

-}

diff --git a/testhal/STM32F1xx/USB_MSC/mcuconf.h b/testhal/STM32F1xx/USB_MSC/mcuconf.h
deleted file mode 100644
index 157bbda32..000000000
--- a/testhal/STM32F1xx/USB_MSC/mcuconf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#define STM32F103_MCUCONF

-

-/*

- * STM32F103 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the whole

- * driver is enabled in halconf.h.

- *

- * IRQ priorities:

- * 15...0       Lowest...Highest.

- *

- * DMA priorities:

- * 0...3        Lowest...Highest.

- */

-

-/*

- * HAL driver system settings.

- */

-#define STM32_NO_INIT                       FALSE

-#define STM32_HSI_ENABLED                   TRUE

-#define STM32_LSI_ENABLED                   FALSE

-#define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

-#define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

-#define STM32_PLLMUL_VALUE                  9

-#define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV2

-#define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_USB_CLOCK_REQUIRED            TRUE

-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

-#define STM32_PVD_ENABLE                    FALSE

-#define STM32_PLS                           STM32_PLS_LEV0

-

-/*

- * ADC driver system settings.

- */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_ADC1_DMA_PRIORITY         2

-#define STM32_ADC_ADC1_IRQ_PRIORITY         6

-

-/*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-

-/*

- * GPT driver system settings.

- */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_USE_TIM5                  FALSE

-#define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

-#define STM32_GPT_TIM5_IRQ_PRIORITY         7

-#define STM32_GPT_TIM8_IRQ_PRIORITY         7

-

-/*

- * I2C driver system settings.

- */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_I2C1_IRQ_PRIORITY         5

-#define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C1_DMA_PRIORITY         3

-#define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-

-/*

- * ICU driver system settings.

- */

-#define STM32_ICU_USE_TIM1                  FALSE

-#define STM32_ICU_USE_TIM2                  FALSE

-#define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

-#define STM32_ICU_USE_TIM5                  FALSE

-#define STM32_ICU_USE_TIM8                  FALSE

-#define STM32_ICU_TIM1_IRQ_PRIORITY         7

-#define STM32_ICU_TIM2_IRQ_PRIORITY         7

-#define STM32_ICU_TIM3_IRQ_PRIORITY         7

-#define STM32_ICU_TIM4_IRQ_PRIORITY         7

-#define STM32_ICU_TIM5_IRQ_PRIORITY         7

-#define STM32_ICU_TIM8_IRQ_PRIORITY         7

-

-/*

- * PWM driver system settings.

- */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  FALSE

-#define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

-#define STM32_PWM_USE_TIM5                  FALSE

-#define STM32_PWM_USE_TIM8                  FALSE

-#define STM32_PWM_TIM1_IRQ_PRIORITY         7

-#define STM32_PWM_TIM2_IRQ_PRIORITY         7

-#define STM32_PWM_TIM3_IRQ_PRIORITY         7

-#define STM32_PWM_TIM4_IRQ_PRIORITY         7

-#define STM32_PWM_TIM5_IRQ_PRIORITY         7

-#define STM32_PWM_TIM8_IRQ_PRIORITY         7

-

-/*

- * RTC driver system settings.

- */

-#define STM32_RTC_IRQ_PRIORITY              15

-

-/*

- * SERIAL driver system settings.

- */

-#define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

-#define STM32_SERIAL_USE_USART3             FALSE

-#define STM32_SERIAL_USE_UART4              FALSE

-#define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USART1_PRIORITY        12

-#define STM32_SERIAL_USART2_PRIORITY        12

-#define STM32_SERIAL_USART3_PRIORITY        12

-#define STM32_SERIAL_UART4_PRIORITY         12

-#define STM32_SERIAL_UART5_PRIORITY         12

-

-/*

- * SPI driver system settings.

- */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

-#define STM32_SPI_SPI1_DMA_PRIORITY         1

-#define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

-#define STM32_SPI_SPI1_IRQ_PRIORITY         10

-#define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

-

-/*

- * UART driver system settings.

- */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

-#define STM32_UART_USART1_IRQ_PRIORITY      12

-#define STM32_UART_USART2_IRQ_PRIORITY      12

-#define STM32_UART_USART3_IRQ_PRIORITY      12

-#define STM32_UART_USART1_DMA_PRIORITY      0

-#define STM32_UART_USART2_DMA_PRIORITY      0

-#define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

-

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  TRUE

-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

-#define STM32_USB_USB1_HP_IRQ_PRIORITY      13

-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

-

diff --git a/testhal/STM32F30x/ADC/.cproject b/testhal/STM32F30x/ADC/.cproject
index 18ecf6a9c..7a8791dfc 100644
--- a/testhal/STM32F30x/ADC/.cproject
+++ b/testhal/STM32F30x/ADC/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.1093754934." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1759793652" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1759793652.1073835528" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.414217340" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.414217340" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1008021590" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.562952538" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.270557492" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/ADC/.project b/testhal/STM32F30x/ADC/.project
index 723f89815..9503708ca 100644
--- a/testhal/STM32F30x/ADC/.project
+++ b/testhal/STM32F30x/ADC/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/ADC/Makefile b/testhal/STM32F30x/ADC/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/ADC/Makefile
+++ b/testhal/STM32F30x/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/ADC/chconf.h b/testhal/STM32F30x/ADC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/ADC/chconf.h
+++ b/testhal/STM32F30x/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/ADC/halconf.h b/testhal/STM32F30x/ADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F30x/ADC/halconf.h
+++ b/testhal/STM32F30x/ADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/ADC/main.c b/testhal/STM32F30x/ADC/main.c
index 8489f1bef..9306b14d1 100644
--- a/testhal/STM32F30x/ADC/main.c
+++ b/testhal/STM32F30x/ADC/main.c
@@ -104,7 +104,7 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/ADC/mcuconf.h b/testhal/STM32F30x/ADC/mcuconf.h
index 3f9c9b5fa..7838058a0 100644
--- a/testhal/STM32F30x/ADC/mcuconf.h
+++ b/testhal/STM32F30x/ADC/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/ADC_DUAL/.cproject b/testhal/STM32F30x/ADC_DUAL/.cproject
index 151e30397..980f2e991 100644
--- a/testhal/STM32F30x/ADC_DUAL/.cproject
+++ b/testhal/STM32F30x/ADC_DUAL/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.269849277." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.689247287" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.689247287.2040844148" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.250518604" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.250518604" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1289173301" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1429619453" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.448763111" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/ADC_DUAL/.project b/testhal/STM32F30x/ADC_DUAL/.project
index 216f76c48..86fadf546 100644
--- a/testhal/STM32F30x/ADC_DUAL/.project
+++ b/testhal/STM32F30x/ADC_DUAL/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32F30x/ADC_DUAL/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/ADC_DUAL/Makefile
+++ b/testhal/STM32F30x/ADC_DUAL/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/ADC_DUAL/chconf.h b/testhal/STM32F30x/ADC_DUAL/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/ADC_DUAL/chconf.h
+++ b/testhal/STM32F30x/ADC_DUAL/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/ADC_DUAL/halconf.h b/testhal/STM32F30x/ADC_DUAL/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F30x/ADC_DUAL/halconf.h
+++ b/testhal/STM32F30x/ADC_DUAL/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/ADC_DUAL/main.c b/testhal/STM32F30x/ADC_DUAL/main.c
index c4fa35c5c..849207de0 100644
--- a/testhal/STM32F30x/ADC_DUAL/main.c
+++ b/testhal/STM32F30x/ADC_DUAL/main.c
@@ -128,7 +128,7 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/ADC_DUAL/mcuconf.h b/testhal/STM32F30x/ADC_DUAL/mcuconf.h
index 4b69ad89d..3468f7e92 100644
--- a/testhal/STM32F30x/ADC_DUAL/mcuconf.h
+++ b/testhal/STM32F30x/ADC_DUAL/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/CAN/.cproject b/testhal/STM32F30x/CAN/.cproject
index 7cdad62bb..e18f952ce 100644
--- a/testhal/STM32F30x/CAN/.cproject
+++ b/testhal/STM32F30x/CAN/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/CAN/.project b/testhal/STM32F30x/CAN/.project
index a01f8a133..03f4bead6 100644
--- a/testhal/STM32F30x/CAN/.project
+++ b/testhal/STM32F30x/CAN/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/CAN/Makefile b/testhal/STM32F30x/CAN/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/CAN/Makefile
+++ b/testhal/STM32F30x/CAN/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/CAN/chconf.h b/testhal/STM32F30x/CAN/chconf.h
index f943ea80c..b6ca0aa69 100644
--- a/testhal/STM32F30x/CAN/chconf.h
+++ b/testhal/STM32F30x/CAN/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/CAN/halconf.h b/testhal/STM32F30x/CAN/halconf.h
index 5b6535967..a1195d7e1 100644
--- a/testhal/STM32F30x/CAN/halconf.h
+++ b/testhal/STM32F30x/CAN/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/CAN/main.c b/testhal/STM32F30x/CAN/main.c
index c44acf566..27ba16bf7 100644
--- a/testhal/STM32F30x/CAN/main.c
+++ b/testhal/STM32F30x/CAN/main.c
@@ -30,18 +30,18 @@ static const CANConfig cancfg = {
 /*

  * Receiver thread.

  */

-static WORKING_AREA(can_rx_wa, 256);

+static THD_WORKING_AREA(can_rx_wa, 256);

 static msg_t can_rx(void *p) {

-  EventListener el;

+  event_listener_t el;

   CANRxFrame rxmsg;

 

   (void)p;

   chRegSetThreadName("receiver");

   chEvtRegister(&CAND1.rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

+  while(!chThdShouldTerminateX()) {

     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

       continue;

-    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

+    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {

       /* Process message.*/

       palTogglePad(GPIOE, GPIOE_LED3_RED);

     }

@@ -53,7 +53,7 @@ static msg_t can_rx(void *p) {
 /*

  * Transmitter thread.

  */

-static WORKING_AREA(can_tx_wa, 256);

+static THD_WORKING_AREA(can_tx_wa, 256);

 static msg_t can_tx(void * p) {

   CANTxFrame txmsg;

 

@@ -66,7 +66,7 @@ static msg_t can_tx(void * p) {
   txmsg.data32[0] = 0x55AA55AA;

   txmsg.data32[1] = 0x00FF00FF;

 

-  while (!chThdShouldTerminate()) {

+  while (!chThdShouldTerminateX()) {

     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     chThdSleepMilliseconds(500);

   }

diff --git a/testhal/STM32F30x/CAN/mcuconf.h b/testhal/STM32F30x/CAN/mcuconf.h
index 42fc2ed25..86e830fe2 100644
--- a/testhal/STM32F30x/CAN/mcuconf.h
+++ b/testhal/STM32F30x/CAN/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/EXT/.cproject b/testhal/STM32F30x/EXT/.cproject
index 81789e942..c9c383d84 100644
--- a/testhal/STM32F30x/EXT/.cproject
+++ b/testhal/STM32F30x/EXT/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.779783487." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.504160665" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.504160665.1873829009" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1953095184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1953095184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1380710080" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1057984653" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1281924276" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/EXT/.project b/testhal/STM32F30x/EXT/.project
index 7c6f467a6..1504226d3 100644
--- a/testhal/STM32F30x/EXT/.project
+++ b/testhal/STM32F30x/EXT/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/EXT/Makefile b/testhal/STM32F30x/EXT/Makefile
index 8e7cec92d..46e438ab8 100644
--- a/testhal/STM32F30x/EXT/Makefile
+++ b/testhal/STM32F30x/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -114,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/EXT/chconf.h b/testhal/STM32F30x/EXT/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/EXT/chconf.h
+++ b/testhal/STM32F30x/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/EXT/halconf.h b/testhal/STM32F30x/EXT/halconf.h
index e0e0c38ff..5b67db37b 100644
--- a/testhal/STM32F30x/EXT/halconf.h
+++ b/testhal/STM32F30x/EXT/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/EXT/main.c b/testhal/STM32F30x/EXT/main.c
index 9ef548d87..bd8b4359c 100644
--- a/testhal/STM32F30x/EXT/main.c
+++ b/testhal/STM32F30x/EXT/main.c
@@ -25,19 +25,20 @@ static void led5off(void *arg) {
 

 /* Triggered when the button is pressed or released. The LED5 is set to ON.*/

 static void extcb1(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

+  static virtual_timer_t vt4;

 

   (void)extp;

   (void)channel;

 

   palSetPad(GPIOE, GPIOE_LED10_RED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  chSysLockFromISR();

+

+  /* Timer reset, if still active.*/

+  chVTResetI(&vt4);

 

   /* LED4 set to OFF after 200mS.*/

   chVTSetI(&vt4, MS2ST(200), led5off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static const EXTConfig extcfg = {

diff --git a/testhal/STM32F30x/EXT/mcuconf.h b/testhal/STM32F30x/EXT/mcuconf.h
index 42fc2ed25..abb99ae10 100644
--- a/testhal/STM32F30x/EXT/mcuconf.h
+++ b/testhal/STM32F30x/EXT/mcuconf.h
@@ -81,7 +81,7 @@
 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/IRQ_STORM/.cproject b/testhal/STM32F30x/IRQ_STORM/.cproject
index ed2858c43..e59cf38b3 100644
--- a/testhal/STM32F30x/IRQ_STORM/.cproject
+++ b/testhal/STM32F30x/IRQ_STORM/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/IRQ_STORM/.project b/testhal/STM32F30x/IRQ_STORM/.project
index a7a6d0b2e..c3e2f6a31 100644
--- a/testhal/STM32F30x/IRQ_STORM/.project
+++ b/testhal/STM32F30x/IRQ_STORM/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32F30x/IRQ_STORM/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/IRQ_STORM/Makefile
+++ b/testhal/STM32F30x/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/IRQ_STORM/chconf.h b/testhal/STM32F30x/IRQ_STORM/chconf.h
index 38242d75d..7ff9a1440 100644
--- a/testhal/STM32F30x/IRQ_STORM/chconf.h
+++ b/testhal/STM32F30x/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

@@ -526,8 +493,6 @@
 /* Port-specific settings (override port settings defaulted in chcore.h).    */

 /*===========================================================================*/

 

-#define CORTEX_USE_FPU                FALSE

-

 #endif  /* _CHCONF_H_ */

 

 /** @} */

diff --git a/testhal/STM32F30x/IRQ_STORM/halconf.h b/testhal/STM32F30x/IRQ_STORM/halconf.h
index 117a5979b..40207d045 100644
--- a/testhal/STM32F30x/IRQ_STORM/halconf.h
+++ b/testhal/STM32F30x/IRQ_STORM/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/IRQ_STORM/main.c b/testhal/STM32F30x/IRQ_STORM/main.c
index 554faa6fb..89d688016 100644
--- a/testhal/STM32F30x/IRQ_STORM/main.c
+++ b/testhal/STM32F30x/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -117,15 +117,15 @@ static msg_t WorkerThread(void *arg) {
 /*

  * GPT2 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -135,19 +135,20 @@ static void gpt3cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

  * GPT2 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt4cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -157,6 +158,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -221,14 +223,14 @@ int main(void) {
   /*

    * Activates GPTs.

    */

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD4, &gpt4cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -243,19 +245,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -291,10 +293,10 @@ int main(void) {
     saturated = FALSE;

     threshold = 0;

     for (interval = 2000; interval >= 10; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -315,7 +317,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

diff --git a/testhal/STM32F30x/IRQ_STORM/mcuconf.h b/testhal/STM32F30x/IRQ_STORM/mcuconf.h
index d33f5ae33..082f71c8f 100644
--- a/testhal/STM32F30x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F30x/IRQ_STORM/mcuconf.h
@@ -107,16 +107,16 @@
  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  TRUE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

 #define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM6                  TRUE

 #define STM32_GPT_USE_TIM7                  TRUE

 #define STM32_GPT_USE_TIM8                  TRUE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         6

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         10

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM4_IRQ_PRIORITY         6

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

 #define STM32_GPT_TIM8_IRQ_PRIORITY         7

@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/PWM-ICU/.cproject b/testhal/STM32F30x/PWM-ICU/.cproject
index 0bb5b2f00..94e436ca4 100644
--- a/testhal/STM32F30x/PWM-ICU/.cproject
+++ b/testhal/STM32F30x/PWM-ICU/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/PWM-ICU/.project b/testhal/STM32F30x/PWM-ICU/.project
index 6d36832e8..d8190d4c4 100644
--- a/testhal/STM32F30x/PWM-ICU/.project
+++ b/testhal/STM32F30x/PWM-ICU/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/PWM-ICU/Makefile b/testhal/STM32F30x/PWM-ICU/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/PWM-ICU/Makefile
+++ b/testhal/STM32F30x/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/PWM-ICU/chconf.h b/testhal/STM32F30x/PWM-ICU/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/PWM-ICU/chconf.h
+++ b/testhal/STM32F30x/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/PWM-ICU/halconf.h b/testhal/STM32F30x/PWM-ICU/halconf.h
index 2f74c82c8..c1a492c2d 100644
--- a/testhal/STM32F30x/PWM-ICU/halconf.h
+++ b/testhal/STM32F30x/PWM-ICU/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/PWM-ICU/main.c b/testhal/STM32F30x/PWM-ICU/main.c
index 4d7c3afd0..96444baef 100644
--- a/testhal/STM32F30x/PWM-ICU/main.c
+++ b/testhal/STM32F30x/PWM-ICU/main.c
@@ -83,13 +83,13 @@ int main(void) {
   chSysInit();

 

   /*

-   * Initializes the PWM driver 2 and ICU driver 3.

-   * GPIOA15 is the PWM output.

-   * GPIOC6 is the ICU input.

+   * Initializes the PWM driver 4 and ICU driver 3.

+   * GPIOD12 is the PWM output channel 0.

+   * GPIOC6 is the ICU input ICU_CHANNEL_1.

    * The two pins have to be externally connected together.

    */

-  pwmStart(&PWMD2, &pwmcfg);

-  palSetPadMode(GPIOA, 15, PAL_MODE_ALTERNATE(1));

+  pwmStart(&PWMD4, &pwmcfg);

+  palSetPadMode(GPIOD, 12, PAL_MODE_ALTERNATE(2));

   icuStart(&ICUD3, &icucfg);

   palSetPadMode(GPIOC, 6, PAL_MODE_ALTERNATE(2));

   icuEnable(&ICUD3);

@@ -98,33 +98,33 @@ int main(void) {
   /*

    * Starts the PWM channel 0 using 75% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 7500));

+  pwmEnableChannel(&PWMD4, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD4, 7500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 50% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 5000));

+  pwmEnableChannel(&PWMD4, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD4, 5000));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 25% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 2500));

+  pwmEnableChannel(&PWMD4, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD4, 2500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes PWM period to half second the duty cycle becomes 50%

    * implicitly.

    */

-  pwmChangePeriod(&PWMD2, 5000);

+  pwmChangePeriod(&PWMD4, 5000);

   chThdSleepMilliseconds(5000);

 

   /*

    * Disables channel 0 and stops the drivers.

    */

-  pwmDisableChannel(&PWMD2, 0);

-  pwmStop(&PWMD2);

+  pwmDisableChannel(&PWMD4, 0);

+  pwmStop(&PWMD4);

   icuDisable(&ICUD3);

   icuStop(&ICUD3);

   palClearPad(GPIOE, GPIOE_LED4_BLUE);

diff --git a/testhal/STM32F30x/PWM-ICU/mcuconf.h b/testhal/STM32F30x/PWM-ICU/mcuconf.h
index ca40cb887..bb59d7e27 100644
--- a/testhal/STM32F30x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F30x/PWM-ICU/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -138,7 +139,7 @@
 #define STM32_ICU_USE_TIM1                  TRUE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  TRUE

-#define STM32_ICU_USE_TIM4                  TRUE

+#define STM32_ICU_USE_TIM4                  FALSE

 #define STM32_ICU_USE_TIM8                  TRUE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

 #define STM32_ICU_TIM2_IRQ_PRIORITY         7

@@ -151,9 +152,9 @@
  */

 #define STM32_PWM_USE_ADVANCED              FALSE

 #define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  TRUE

+#define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  FALSE

+#define STM32_PWM_USE_TIM4                  TRUE

 #define STM32_PWM_USE_TIM8                  FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

 #define STM32_PWM_TIM2_IRQ_PRIORITY         7

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/PWM-ICU/readme.txt b/testhal/STM32F30x/PWM-ICU/readme.txt
index cfb53f76a..bf4069267 100644
--- a/testhal/STM32F30x/PWM-ICU/readme.txt
+++ b/testhal/STM32F30x/PWM-ICU/readme.txt
@@ -12,7 +12,7 @@ The application demonstrates the use of the STM32F30x PWM-ICU drivers.
 

 ** Board Setup **

 

-- Connect PA15 and PC6 together.

+- Connect PD12 (PWM output) and PC6 (ICU input) together.

 

 ** Build Procedure **

 

diff --git a/testhal/STM32F30x/SPI/.cproject b/testhal/STM32F30x/SPI/.cproject
index 104d73e64..697309c7f 100644
--- a/testhal/STM32F30x/SPI/.cproject
+++ b/testhal/STM32F30x/SPI/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/SPI/.project b/testhal/STM32F30x/SPI/.project
index 61b728dcf..5c0b3a88c 100644
--- a/testhal/STM32F30x/SPI/.project
+++ b/testhal/STM32F30x/SPI/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/SPI/Makefile b/testhal/STM32F30x/SPI/Makefile
index 455c2e5da..46e438ab8 100644
--- a/testhal/STM32F30x/SPI/Makefile
+++ b/testhal/STM32F30x/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/SPI/chconf.h b/testhal/STM32F30x/SPI/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/SPI/chconf.h
+++ b/testhal/STM32F30x/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/SPI/halconf.h b/testhal/STM32F30x/SPI/halconf.h
index 3e1cafbbf..99f546dd1 100644
--- a/testhal/STM32F30x/SPI/halconf.h
+++ b/testhal/STM32F30x/SPI/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/SPI/main.c b/testhal/STM32F30x/SPI/main.c
index aedae794a..84c870354 100644
--- a/testhal/STM32F30x/SPI/main.c
+++ b/testhal/STM32F30x/SPI/main.c
@@ -48,7 +48,7 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

 static msg_t spi_thread_1(void *p) {

 

   (void)p;

@@ -69,7 +69,7 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

 static msg_t spi_thread_2(void *p) {

 

   (void)p;

@@ -90,7 +90,7 @@ static msg_t spi_thread_2(void *p) {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(blinker_wa, 128);

+static THD_WORKING_AREA(blinker_wa, 128);

 static msg_t blinker(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/SPI/mcuconf.h b/testhal/STM32F30x/SPI/mcuconf.h
index 1768aa8db..8ba3d4ea8 100644
--- a/testhal/STM32F30x/SPI/mcuconf.h
+++ b/testhal/STM32F30x/SPI/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -187,7 +188,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/UART/.cproject b/testhal/STM32F30x/UART/.cproject
index 661d548d0..813ef9678 100644
--- a/testhal/STM32F30x/UART/.cproject
+++ b/testhal/STM32F30x/UART/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.2073938137." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1743372457" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1743372457.434488400" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1298110239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1298110239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.546527516" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1727550430" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1626540872" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/UART/.project b/testhal/STM32F30x/UART/.project
index 24b9d53ce..15900d6dc 100644
--- a/testhal/STM32F30x/UART/.project
+++ b/testhal/STM32F30x/UART/.project
@@ -79,7 +79,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/UART/Makefile b/testhal/STM32F30x/UART/Makefile
index 8e7cec92d..46e438ab8 100644
--- a/testhal/STM32F30x/UART/Makefile
+++ b/testhal/STM32F30x/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -114,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/UART/chconf.h b/testhal/STM32F30x/UART/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/UART/chconf.h
+++ b/testhal/STM32F30x/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/UART/halconf.h b/testhal/STM32F30x/UART/halconf.h
index a4fc70926..e9b103442 100644
--- a/testhal/STM32F30x/UART/halconf.h
+++ b/testhal/STM32F30x/UART/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/UART/main.c b/testhal/STM32F30x/UART/main.c
index 9d0bea53c..170f14f20 100644
--- a/testhal/STM32F30x/UART/main.c
+++ b/testhal/STM32F30x/UART/main.c
@@ -17,15 +17,15 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt1, vt2;

+static virtual_timer_t vt1, vt2;

 

 static void restart(void *p) {

 

   (void)p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   uartStartSendI(&UARTD1, 14, "Hello World!\r\n");

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static void ledoff(void *p) {

@@ -51,11 +51,10 @@ static void txend2(UARTDriver *uartp) {
 

   (void)uartp;

   palClearPad(GPIOE, GPIOE_LED3_RED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt1))

-    chVTResetI(&vt1);

+  chSysLockFromISR();

+  chVTResetI(&vt1);

   chVTSetI(&vt1, MS2ST(5000), restart, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -78,11 +77,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
   (void)c;

   /* Flashing the LED each time a character is received.*/

   palSetPad(GPIOE, GPIOE_LED3_RED);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt2))

-    chVTResetI(&vt2);

+  chSysLockFromISR();

+  chVTResetI(&vt2);

   chVTSetI(&vt2, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32F30x/UART/mcuconf.h b/testhal/STM32F30x/UART/mcuconf.h
index 0eaddf96a..f3ebfcc2a 100644
--- a/testhal/STM32F30x/UART/mcuconf.h
+++ b/testhal/STM32F30x/UART/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -187,7 +188,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F30x/USB_CDC/.cproject b/testhal/STM32F30x/USB_CDC/.cproject
index 839c40d30..49ee0dcf1 100644
--- a/testhal/STM32F30x/USB_CDC/.cproject
+++ b/testhal/STM32F30x/USB_CDC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/USB_CDC/.project b/testhal/STM32F30x/USB_CDC/.project
index a1dcbcd63..9c8e08513 100644
--- a/testhal/STM32F30x/USB_CDC/.project
+++ b/testhal/STM32F30x/USB_CDC/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F3_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F30x/USB_CDC/Makefile b/testhal/STM32F30x/USB_CDC/Makefile
index 1f03d2992..268398918 100644
--- a/testhal/STM32F30x/USB_CDC/Makefile
+++ b/testhal/STM32F30x/USB_CDC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F303xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        $(CHIBIOS)/os/various/shell.c \

@@ -115,7 +133,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +158,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +179,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +201,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F30x/USB_CDC/chconf.h b/testhal/STM32F30x/USB_CDC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F30x/USB_CDC/chconf.h
+++ b/testhal/STM32F30x/USB_CDC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F30x/USB_CDC/halconf.h b/testhal/STM32F30x/USB_CDC/halconf.h
index cd76b0cfe..09a9a0cdb 100644
--- a/testhal/STM32F30x/USB_CDC/halconf.h
+++ b/testhal/STM32F30x/USB_CDC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F30x/USB_CDC/main.c b/testhal/STM32F30x/USB_CDC/main.c
index 6555da8d3..31122bcbd 100644
--- a/testhal/STM32F30x/USB_CDC/main.c
+++ b/testhal/STM32F30x/USB_CDC/main.c
@@ -292,7 +292,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   case USB_EVENT_ADDRESS:

     return;

   case USB_EVENT_CONFIGURED:

-    chSysLockFromIsr();

+    chSysLockFromISR();

 

     /* Enables the endpoints specified into the configuration.

        Note, this callback is invoked from an ISR so I-Class functions

@@ -303,7 +303,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Resetting the state of the CDC subsystem.*/

     sduConfigureHookI(&SDU1);

 

-    chSysUnlockFromIsr();

+    chSysUnlockFromISR();

     return;

   case USB_EVENT_SUSPEND:

     return;

@@ -339,8 +339,8 @@ static const SerialUSBConfig serusbcfg = {
 /* Command line related.                                                     */

 /*===========================================================================*/

 

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-#define TEST_WA_SIZE    THD_WA_SIZE(256)

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

   size_t n, size;

@@ -357,34 +357,34 @@ 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};

-  Thread *tp;

+  static const char *states[] = {CH_STATE_NAMES};

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: threads\r\n");

     return;

   }

-  chprintf(chp, "    addr    stack prio refs     state time\r\n");

+  chprintf(chp, "    addr    stack prio refs     state\r\n");

   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]);

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }

 

 static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: test\r\n");

     return;

   }

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),

+  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

                            TestThread, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory\r\n");

@@ -444,7 +444,7 @@ static const ShellConfig shell_cfg1 = {
 /*

  * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

@@ -462,7 +462,7 @@ static msg_t Thread1(void *arg) {
  * Application entry point.

  */

 int main(void) {

-  Thread *shelltp = NULL;

+  thread_t *shelltp = NULL;

 

   /*

    * System initializations.

@@ -507,7 +507,7 @@ int main(void) {
   while (TRUE) {

     if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))

       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

-    else if (chThdTerminated(shelltp)) {

+    else if (chThdTerminatedX(shelltp)) {

       chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

       shelltp = NULL;           /* Triggers spawning of a new shell.        */

     }

diff --git a/testhal/STM32F30x/USB_CDC/mcuconf.h b/testhal/STM32F30x/USB_CDC/mcuconf.h
index c0a1aaa0f..57f596299 100644
--- a/testhal/STM32F30x/USB_CDC/mcuconf.h
+++ b/testhal/STM32F30x/USB_CDC/mcuconf.h
@@ -126,11 +126,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -178,16 +179,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -201,7 +208,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/ADC/.project b/testhal/STM32F37x/ADC/.project
index cf24ffaeb..1ac97fa04 100644
--- a/testhal/STM32F37x/ADC/.project
+++ b/testhal/STM32F37x/ADC/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/ADC/Makefile b/testhal/STM32F37x/ADC/Makefile
index 684302ce4..d8a5decbb 100644
--- a/testhal/STM32F37x/ADC/Makefile
+++ b/testhal/STM32F37x/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -138,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -158,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -203,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/ADC/chconf.h b/testhal/STM32F37x/ADC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/ADC/chconf.h
+++ b/testhal/STM32F37x/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/ADC/halconf.h b/testhal/STM32F37x/ADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F37x/ADC/halconf.h
+++ b/testhal/STM32F37x/ADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/ADC/main.c b/testhal/STM32F37x/ADC/main.c
index b9a481825..b54733dae 100644
--- a/testhal/STM32F37x/ADC/main.c
+++ b/testhal/STM32F37x/ADC/main.c
@@ -106,8 +106,8 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

   chRegSetThreadName("blinker");

diff --git a/testhal/STM32F37x/ADC/mcuconf.h b/testhal/STM32F37x/ADC/mcuconf.h
index 24b77b33d..d4e69dafe 100644
--- a/testhal/STM32F37x/ADC/mcuconf.h
+++ b/testhal/STM32F37x/ADC/mcuconf.h
@@ -66,7 +66,6 @@
 #define STM32_ADC_USE_SDADC1                FALSE

 #define STM32_ADC_USE_SDADC2                FALSE

 #define STM32_ADC_USE_SDADC3                FALSE

-#define STM32_ADC_SDADC_SLOW_MODE           FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_SDADC1_DMA_PRIORITY       2

 #define STM32_ADC_SDADC2_DMA_PRIORITY       2

@@ -128,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -162,7 +162,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -184,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -198,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/CAN/.project b/testhal/STM32F37x/CAN/.project
index d26e9f35e..5afd7689e 100644
--- a/testhal/STM32F37x/CAN/.project
+++ b/testhal/STM32F37x/CAN/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/CAN/Makefile b/testhal/STM32F37x/CAN/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/CAN/Makefile
+++ b/testhal/STM32F37x/CAN/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/CAN/chconf.h b/testhal/STM32F37x/CAN/chconf.h
index f943ea80c..b6ca0aa69 100644
--- a/testhal/STM32F37x/CAN/chconf.h
+++ b/testhal/STM32F37x/CAN/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/CAN/halconf.h b/testhal/STM32F37x/CAN/halconf.h
index 5b6535967..a1195d7e1 100644
--- a/testhal/STM32F37x/CAN/halconf.h
+++ b/testhal/STM32F37x/CAN/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/CAN/main.c b/testhal/STM32F37x/CAN/main.c
index 12e0c4650..7b8b7bf59 100644
--- a/testhal/STM32F37x/CAN/main.c
+++ b/testhal/STM32F37x/CAN/main.c
@@ -30,18 +30,18 @@ static const CANConfig cancfg = {
 /*

  * Receiver thread.

  */

-static WORKING_AREA(can_rx_wa, 256);

-static msg_t can_rx(void *p) {

-  EventListener el;

+static THD_WORKING_AREA(can_rx_wa, 256);

+static THD_FUNCTION(can_rx, p) {

+  event_listener_t el;

   CANRxFrame rxmsg;

 

   (void)p;

   chRegSetThreadName("receiver");

   chEvtRegister(&CAND1.rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

+  while(!chThdShouldTerminateX()) {

     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

       continue;

-    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

+    while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {

       /* Process message.*/

       palTogglePad(GPIOC, GPIOC_LED1);

     }

@@ -53,8 +53,8 @@ static msg_t can_rx(void *p) {
 /*

  * Transmitter thread.

  */

-static WORKING_AREA(can_tx_wa, 256);

-static msg_t can_tx(void * p) {

+static THD_WORKING_AREA(can_tx_wa, 256);

+static THD_FUNCTION(can_tx, p) {

   CANTxFrame txmsg;

 

   (void)p;

@@ -66,7 +66,7 @@ static msg_t can_tx(void * p) {
   txmsg.data32[0] = 0x55AA55AA;

   txmsg.data32[1] = 0x00FF00FF;

 

-  while (!chThdShouldTerminate()) {

+  while (!chThdShouldTerminateX()) {

     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     chThdSleepMilliseconds(500);

   }

diff --git a/testhal/STM32F37x/CAN/mcuconf.h b/testhal/STM32F37x/CAN/mcuconf.h
index 5f1ba1599..169b64c76 100644
--- a/testhal/STM32F37x/CAN/mcuconf.h
+++ b/testhal/STM32F37x/CAN/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -161,7 +162,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/EXT/.project b/testhal/STM32F37x/EXT/.project
index e64b8406f..042fdd5c9 100644
--- a/testhal/STM32F37x/EXT/.project
+++ b/testhal/STM32F37x/EXT/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/EXT/Makefile b/testhal/STM32F37x/EXT/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/EXT/Makefile
+++ b/testhal/STM32F37x/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/EXT/chconf.h b/testhal/STM32F37x/EXT/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/EXT/chconf.h
+++ b/testhal/STM32F37x/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/EXT/halconf.h b/testhal/STM32F37x/EXT/halconf.h
index e0e0c38ff..5b67db37b 100644
--- a/testhal/STM32F37x/EXT/halconf.h
+++ b/testhal/STM32F37x/EXT/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/EXT/main.c b/testhal/STM32F37x/EXT/main.c
index 7c158e306..ed42de752 100644
--- a/testhal/STM32F37x/EXT/main.c
+++ b/testhal/STM32F37x/EXT/main.c
@@ -20,24 +20,23 @@
 static void led5off(void *arg) {

 

   (void)arg;

-  palClearPad(GPIOC, GPIOC_LED1);

+  palSetPad(GPIOC, GPIOC_LED1);

 }

 

 /* Triggered when the button is pressed or released. The LED5 is set to ON.*/

 static void extcb1(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

+  static virtual_timer_t vt4;

 

   (void)extp;

   (void)channel;

 

-  palSetPad(GPIOC, GPIOC_LED1);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  palClearPad(GPIOC, GPIOC_LED1);

+  chSysLockFromISR();

+  chVTResetI(&vt4);

 

   /* LED4 set to OFF after 200mS.*/

-  chVTSetI(&vt4, MS2ST(200), led5off, NULL);

-  chSysUnlockFromIsr();

+  chVTDoSetI(&vt4, MS2ST(200), led5off, NULL);

+  chSysUnlockFromISR();

 }

 

 static const EXTConfig extcfg = {

diff --git a/testhal/STM32F37x/EXT/mcuconf.h b/testhal/STM32F37x/EXT/mcuconf.h
index 5f1ba1599..169b64c76 100644
--- a/testhal/STM32F37x/EXT/mcuconf.h
+++ b/testhal/STM32F37x/EXT/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -161,7 +162,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/I2C/.project b/testhal/STM32F37x/I2C/.project
index 03945c10e..e6d8e13d9 100644
--- a/testhal/STM32F37x/I2C/.project
+++ b/testhal/STM32F37x/I2C/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/I2C/Makefile b/testhal/STM32F37x/I2C/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/I2C/Makefile
+++ b/testhal/STM32F37x/I2C/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/I2C/chconf.h b/testhal/STM32F37x/I2C/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/I2C/chconf.h
+++ b/testhal/STM32F37x/I2C/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/I2C/halconf.h b/testhal/STM32F37x/I2C/halconf.h
index 3ac5de5ba..858b84dbe 100644
--- a/testhal/STM32F37x/I2C/halconf.h
+++ b/testhal/STM32F37x/I2C/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/I2C/main.c b/testhal/STM32F37x/I2C/main.c
index fc0e4e2ab..cd1ac7417 100644
--- a/testhal/STM32F37x/I2C/main.c
+++ b/testhal/STM32F37x/I2C/main.c
@@ -44,10 +44,11 @@ static const I2CConfig i2cconfig = {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(blinker_wa, 128);

-static msg_t blinker(void *arg) {

+static THD_WORKING_AREA(blinker_wa, 128);

+static THD_FUNCTION(blinker, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     palSetPad(GPIOC, GPIOC_LED1);

@@ -95,12 +96,12 @@ int main(void) {
 

     msg = i2cMasterTransmitTimeout(&I2CD2, 0x52, cmd, sizeof(cmd),

                                    data, sizeof(data), TIME_INFINITE);

-    if (msg != RDY_OK)

+    if (msg != MSG_OK)

       palTogglePad(GPIOC, GPIOC_LED3);

     for (i = 0; i < 256; i++) {

       msg = i2cMasterReceiveTimeout(&I2CD2, 0x52,

                                     data, sizeof(data), TIME_INFINITE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         palTogglePad(GPIOC, GPIOC_LED3);

     }

     chThdSleepMilliseconds(500);

diff --git a/testhal/STM32F37x/I2C/mcuconf.h b/testhal/STM32F37x/I2C/mcuconf.h
index 8bab824f7..ae51be7b1 100644
--- a/testhal/STM32F37x/I2C/mcuconf.h
+++ b/testhal/STM32F37x/I2C/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  TRUE

 #define STM32_I2C_USE_I2C2                  TRUE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -175,7 +176,7 @@
  * SPI driver system settings.

  */

 #define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  TRUE

+#define STM32_SPI_USE_SPI2                  FALSE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/IRQ_STORM/.cproject b/testhal/STM32F37x/IRQ_STORM/.cproject
index bf0ac2f78..77982a8a0 100644
--- a/testhal/STM32F37x/IRQ_STORM/.cproject
+++ b/testhal/STM32F37x/IRQ_STORM/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F37x/IRQ_STORM/.project b/testhal/STM32F37x/IRQ_STORM/.project
index da09bb566..9768d6602 100644
--- a/testhal/STM32F37x/IRQ_STORM/.project
+++ b/testhal/STM32F37x/IRQ_STORM/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/IRQ_STORM/Makefile b/testhal/STM32F37x/IRQ_STORM/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/IRQ_STORM/Makefile
+++ b/testhal/STM32F37x/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/IRQ_STORM/chconf.h b/testhal/STM32F37x/IRQ_STORM/chconf.h
index 38242d75d..7ff9a1440 100644
--- a/testhal/STM32F37x/IRQ_STORM/chconf.h
+++ b/testhal/STM32F37x/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

@@ -526,8 +493,6 @@
 /* Port-specific settings (override port settings defaulted in chcore.h).    */

 /*===========================================================================*/

 

-#define CORTEX_USE_FPU                FALSE

-

 #endif  /* _CHCONF_H_ */

 

 /** @} */

diff --git a/testhal/STM32F37x/IRQ_STORM/halconf.h b/testhal/STM32F37x/IRQ_STORM/halconf.h
index 117a5979b..40207d045 100644
--- a/testhal/STM32F37x/IRQ_STORM/halconf.h
+++ b/testhal/STM32F37x/IRQ_STORM/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/IRQ_STORM/main.c b/testhal/STM32F37x/IRQ_STORM/main.c
index 59e32f8df..5d42eb65e 100644
--- a/testhal/STM32F37x/IRQ_STORM/main.c
+++ b/testhal/STM32F37x/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -121,11 +121,11 @@ static void gpt2cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -135,11 +135,11 @@ static void gpt3cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -148,6 +148,7 @@ static void gpt3cb(GPTDriver *gptp) {
 static const GPTConfig gpt2cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt2cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -157,6 +158,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -220,14 +222,14 @@ int main(void) {
   /*

    * Activates GPTs.

    */

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD4, &gpt2cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -242,19 +244,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -290,10 +292,10 @@ int main(void) {
     saturated = FALSE;

     threshold = 0;

     for (interval = 2000; interval >= 10; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -314,7 +316,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

diff --git a/testhal/STM32F37x/IRQ_STORM/mcuconf.h b/testhal/STM32F37x/IRQ_STORM/mcuconf.h
index 713d3261b..a913da351 100644
--- a/testhal/STM32F37x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F37x/IRQ_STORM/mcuconf.h
@@ -105,7 +105,7 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

 #define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  TRUE

@@ -113,9 +113,9 @@
 #define STM32_GPT_USE_TIM7                  TRUE

 #define STM32_GPT_USE_TIM12                 TRUE

 #define STM32_GPT_USE_TIM14                 TRUE

-#define STM32_GPT_TIM2_IRQ_PRIORITY         6

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         10

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM4_IRQ_PRIORITY         6

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/PWM-ICU/.project b/testhal/STM32F37x/PWM-ICU/.project
index 958fa1637..3ee772eaa 100644
--- a/testhal/STM32F37x/PWM-ICU/.project
+++ b/testhal/STM32F37x/PWM-ICU/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/PWM-ICU/Makefile b/testhal/STM32F37x/PWM-ICU/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/PWM-ICU/Makefile
+++ b/testhal/STM32F37x/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/PWM-ICU/chconf.h b/testhal/STM32F37x/PWM-ICU/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/PWM-ICU/chconf.h
+++ b/testhal/STM32F37x/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/PWM-ICU/halconf.h b/testhal/STM32F37x/PWM-ICU/halconf.h
index 2f74c82c8..c1a492c2d 100644
--- a/testhal/STM32F37x/PWM-ICU/halconf.h
+++ b/testhal/STM32F37x/PWM-ICU/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/PWM-ICU/mcuconf.h b/testhal/STM32F37x/PWM-ICU/mcuconf.h
index 1d0623b8c..d779ed3f8 100644
--- a/testhal/STM32F37x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F37x/PWM-ICU/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -148,7 +149,7 @@
 /*

  * PWM driver system settings.

  */

-#define STM32_PWM_USE_TIM2                  TRUE

+#define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  TRUE

@@ -161,7 +162,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/SDADC/.cproject b/testhal/STM32F37x/SDADC/.cproject
index e3d709437..f3f922904 100644
--- a/testhal/STM32F37x/SDADC/.cproject
+++ b/testhal/STM32F37x/SDADC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F37x/SDADC/.project b/testhal/STM32F37x/SDADC/.project
index 83a87eb03..72cfb92b9 100644
--- a/testhal/STM32F37x/SDADC/.project
+++ b/testhal/STM32F37x/SDADC/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/SDADC/Makefile b/testhal/STM32F37x/SDADC/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/SDADC/Makefile
+++ b/testhal/STM32F37x/SDADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/SDADC/chconf.h b/testhal/STM32F37x/SDADC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/SDADC/chconf.h
+++ b/testhal/STM32F37x/SDADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/SDADC/halconf.h b/testhal/STM32F37x/SDADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F37x/SDADC/halconf.h
+++ b/testhal/STM32F37x/SDADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/SDADC/main.c b/testhal/STM32F37x/SDADC/main.c
index 1d700a3a5..6d5bd4383 100644
--- a/testhal/STM32F37x/SDADC/main.c
+++ b/testhal/STM32F37x/SDADC/main.c
@@ -102,10 +102,11 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     palClearPad(GPIOC, GPIOC_LED1);

diff --git a/testhal/STM32F37x/SDADC/mcuconf.h b/testhal/STM32F37x/SDADC/mcuconf.h
index c90549c5c..9768c0deb 100644
--- a/testhal/STM32F37x/SDADC/mcuconf.h
+++ b/testhal/STM32F37x/SDADC/mcuconf.h
@@ -81,7 +81,7 @@
 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -161,7 +162,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/SPI/.project b/testhal/STM32F37x/SPI/.project
index c3985659c..b3ceb5b95 100644
--- a/testhal/STM32F37x/SPI/.project
+++ b/testhal/STM32F37x/SPI/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/SPI/Makefile b/testhal/STM32F37x/SPI/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/SPI/Makefile
+++ b/testhal/STM32F37x/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/SPI/chconf.h b/testhal/STM32F37x/SPI/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/SPI/chconf.h
+++ b/testhal/STM32F37x/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/SPI/halconf.h b/testhal/STM32F37x/SPI/halconf.h
index 3e1cafbbf..99f546dd1 100644
--- a/testhal/STM32F37x/SPI/halconf.h
+++ b/testhal/STM32F37x/SPI/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/SPI/main.c b/testhal/STM32F37x/SPI/main.c
index 3a828f3a9..7c005122a 100644
--- a/testhal/STM32F37x/SPI/main.c
+++ b/testhal/STM32F37x/SPI/main.c
@@ -48,10 +48,11 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

+static THD_FUNCTION(spi_thread_1, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 1");

   while (TRUE) {

     spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

@@ -69,10 +70,11 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

+static THD_FUNCTION(spi_thread_2, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 2");

   while (TRUE) {

     spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

@@ -91,10 +93,11 @@ static msg_t spi_thread_2(void *p) {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(blinker_wa, 128);

-static msg_t blinker(void *arg) {

+static THD_WORKING_AREA(blinker_wa, 128);

+static THD_FUNCTION(blinker, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     palSetPad(GPIOC, GPIOC_LED1);

diff --git a/testhal/STM32F37x/SPI/mcuconf.h b/testhal/STM32F37x/SPI/mcuconf.h
index cc7cc575a..2269c0a54 100644
--- a/testhal/STM32F37x/SPI/mcuconf.h
+++ b/testhal/STM32F37x/SPI/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -174,16 +175,22 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI1                  TRUE

 #define STM32_SPI_USE_SPI2                  TRUE

-#define STM32_SPI_USE_SPI3                  FALSE

+#define STM32_SPI_USE_SPI3                  TRUE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/UART/.project b/testhal/STM32F37x/UART/.project
index dfdbbc5df..b1fb421f4 100644
--- a/testhal/STM32F37x/UART/.project
+++ b/testhal/STM32F37x/UART/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/UART/Makefile b/testhal/STM32F37x/UART/Makefile
index 782a3b3d7..d8a5decbb 100644
--- a/testhal/STM32F37x/UART/Makefile
+++ b/testhal/STM32F37x/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,8 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/UART/chconf.h b/testhal/STM32F37x/UART/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/UART/chconf.h
+++ b/testhal/STM32F37x/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/UART/halconf.h b/testhal/STM32F37x/UART/halconf.h
index a4fc70926..e9b103442 100644
--- a/testhal/STM32F37x/UART/halconf.h
+++ b/testhal/STM32F37x/UART/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/UART/main.c b/testhal/STM32F37x/UART/main.c
index 7b9577f8a..ddba3eed7 100644
--- a/testhal/STM32F37x/UART/main.c
+++ b/testhal/STM32F37x/UART/main.c
@@ -17,15 +17,15 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt1, vt2;

+static virtual_timer_t vt1, vt2;

 

 static void restart(void *p) {

 

   (void)p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   uartStartSendI(&UARTD2, 14, "Hello World!\r\n");

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static void ledoff(void *p) {

@@ -51,11 +51,10 @@ static void txend2(UARTDriver *uartp) {
 

   (void)uartp;

   palSetPad(GPIOC, GPIOC_LED1);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt1))

-    chVTResetI(&vt1);

-  chVTSetI(&vt1, MS2ST(5000), restart, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt1);

+  chVTDoSetI(&vt1, MS2ST(5000), restart, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

@@ -78,11 +77,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
   (void)c;

   /* Flashing the LED each time a character is received.*/

   palClearPad(GPIOC, GPIOC_LED1);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt2))

-    chVTResetI(&vt2);

-  chVTSetI(&vt2, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt2);

+  chVTDoSetI(&vt2, MS2ST(200), ledoff, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32F37x/UART/mcuconf.h b/testhal/STM32F37x/UART/mcuconf.h
index d7a72a780..869b709e6 100644
--- a/testhal/STM32F37x/UART/mcuconf.h
+++ b/testhal/STM32F37x/UART/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F37x/USB_CDC/.project b/testhal/STM32F37x/USB_CDC/.project
index 4e173140c..fb16abfeb 100644
--- a/testhal/STM32F37x/USB_CDC/.project
+++ b/testhal/STM32F37x/USB_CDC/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F37x/USB_CDC/Makefile b/testhal/STM32F37x/USB_CDC/Makefile
index 60e76cc62..ee16155a1 100644
--- a/testhal/STM32F37x/USB_CDC/Makefile
+++ b/testhal/STM32F37x/USB_CDC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,12 +81,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32373C_EVAL/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F37x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f37x.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F373xC.ld

@@ -81,10 +98,11 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/various/chprintf.c \

+       $(CHIBIOS)/os/various/shell.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,8 +133,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -141,6 +158,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -161,29 +179,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -206,18 +201,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F37x/USB_CDC/chconf.h b/testhal/STM32F37x/USB_CDC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F37x/USB_CDC/chconf.h
+++ b/testhal/STM32F37x/USB_CDC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F37x/USB_CDC/halconf.h b/testhal/STM32F37x/USB_CDC/halconf.h
index cd76b0cfe..09a9a0cdb 100644
--- a/testhal/STM32F37x/USB_CDC/halconf.h
+++ b/testhal/STM32F37x/USB_CDC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F37x/USB_CDC/main.c b/testhal/STM32F37x/USB_CDC/main.c
index 200a0f3d5..8730cabe6 100644
--- a/testhal/STM32F37x/USB_CDC/main.c
+++ b/testhal/STM32F37x/USB_CDC/main.c
@@ -291,7 +291,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   case USB_EVENT_ADDRESS:

     return;

   case USB_EVENT_CONFIGURED:

-    chSysLockFromIsr();

+    chSysLockFromISR();

 

     /* Enables the endpoints specified into the configuration.

        Note, this callback is invoked from an ISR so I-Class functions

@@ -302,7 +302,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Resetting the state of the CDC subsystem.*/

     sduConfigureHookI(&SDU1);

 

-    chSysUnlockFromIsr();

+    chSysUnlockFromISR();

     return;

   case USB_EVENT_SUSPEND:

     return;

@@ -338,8 +338,8 @@ static const SerialUSBConfig serusbcfg = {
 /* Command line related.                                                     */

 /*===========================================================================*/

 

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-#define TEST_WA_SIZE    THD_WA_SIZE(256)

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

   size_t n, size;

@@ -356,8 +356,8 @@ 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};

-  Thread *tp;

+  static const char *states[] = {CH_STATE_NAMES};

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

@@ -367,23 +367,23 @@ static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
   chprintf(chp, "    addr    stack prio refs     state time\r\n");

   tp = chRegFirstThread();

   do {

-    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",

+    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s\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);

+            states[tp->p_state]);

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }

 

 static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: test\r\n");

     return;

   }

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),

+  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

                            TestThread, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory\r\n");

@@ -443,10 +443,11 @@ static const ShellConfig shell_cfg1 = {
 /*

  * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     systime_t time = serusbcfg.usbp->state == USB_ACTIVE ? 250 : 500;

@@ -461,7 +462,7 @@ static msg_t Thread1(void *arg) {
  * Application entry point.

  */

 int main(void) {

-  Thread *shelltp = NULL;

+  thread_t *shelltp = NULL;

 

   /*

    * System initializations.

@@ -506,7 +507,7 @@ int main(void) {
   while (TRUE) {

     if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))

       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

-    else if (chThdTerminated(shelltp)) {

+    else if (chThdTerminatedX(shelltp)) {

       chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

       shelltp = NULL;           /* Triggers spawning of a new shell.        */

     }

diff --git a/testhal/STM32F37x/USB_CDC/mcuconf.h b/testhal/STM32F37x/USB_CDC/mcuconf.h
index 5f8e5044b..4ebd6c8a9 100644
--- a/testhal/STM32F37x/USB_CDC/mcuconf.h
+++ b/testhal/STM32F37x/USB_CDC/mcuconf.h
@@ -127,11 +127,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         10

 #define STM32_I2C_I2C2_IRQ_PRIORITY         10

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -183,7 +184,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -197,7 +204,7 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/ADC/.cproject b/testhal/STM32F4xx/ADC/.cproject
index b279459f3..fe8f3f8c5 100644
--- a/testhal/STM32F4xx/ADC/.cproject
+++ b/testhal/STM32F4xx/ADC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/ADC/.project b/testhal/STM32F4xx/ADC/.project
index eafa4d503..8ce12644e 100644
--- a/testhal/STM32F4xx/ADC/.project
+++ b/testhal/STM32F4xx/ADC/.project
@@ -27,7 +27,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/testhal/STM32F4xx/ADC/Makefile b/testhal/STM32F4xx/ADC/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/ADC/Makefile
+++ b/testhal/STM32F4xx/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/ADC/chconf.h b/testhal/STM32F4xx/ADC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/ADC/chconf.h
+++ b/testhal/STM32F4xx/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/ADC/halconf.h b/testhal/STM32F4xx/ADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32F4xx/ADC/halconf.h
+++ b/testhal/STM32F4xx/ADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/ADC/main.c b/testhal/STM32F4xx/ADC/main.c
index 650347f76..7fff13612 100644
--- a/testhal/STM32F4xx/ADC/main.c
+++ b/testhal/STM32F4xx/ADC/main.c
@@ -89,9 +89,9 @@ static const ADCConversionGroup adcgrpcfg2 = {
 };

 

 /*

- * Red LEDs blinker thread, times are in milliseconds.

+ * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F4xx/ADC/mcuconf.h b/testhal/STM32F4xx/ADC/mcuconf.h
index f933ca55f..52b78c9f5 100644
--- a/testhal/STM32F4xx/ADC/mcuconf.h
+++ b/testhal/STM32F4xx/ADC/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/BKPSRAM/.cproject b/testhal/STM32F4xx/BKPSRAM/.cproject
deleted file mode 100644
index 7b88cc0b5..000000000
--- a/testhal/STM32F4xx/BKPSRAM/.cproject
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="0.597770884">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.597770884" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration buildProperties="" description="" id="0.597770884" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.597770884." name="/" resourcePath="">
-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1309875200" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1309875200.1107041336" name=""/>
-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.334961679" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.209135795" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1477689908" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.739210484" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.529881130" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.357003817" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1682892997" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1182541501" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="BKPSRAM.null.1619726490" name="BKPSRAM"/>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="1">
-		<resource resourceType="PROJECT" workspacePath="/BKPSRAM"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="0.597770884">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-</cproject>
diff --git a/testhal/STM32F4xx/BKPSRAM/.project b/testhal/STM32F4xx/BKPSRAM/.project
deleted file mode 100644
index 78e61fb82..000000000
--- a/testhal/STM32F4xx/BKPSRAM/.project
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BKPSRAM</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>boards</name>
-			<type>2</type>
-			<locationURI>PARENT-3-PROJECT_LOC/boards</locationURI>
-		</link>
-		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-3-PROJECT_LOC/os</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/testhal/STM32F4xx/BKPSRAM/Makefile b/testhal/STM32F4xx/BKPSRAM/Makefile
deleted file mode 100644
index 18d05375d..000000000
--- a/testhal/STM32F4xx/BKPSRAM/Makefile
+++ /dev/null
@@ -1,221 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

-endif

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/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)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m4

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F4xx/BKPSRAM/chconf.h b/testhal/STM32F4xx/BKPSRAM/chconf.h
deleted file mode 100644
index 0a00640e2..000000000
--- a/testhal/STM32F4xx/BKPSRAM/chconf.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-#define PORT_IDLE_THREAD_STACK_SIZE     32

-#define CORTEX_USE_FPU                  FALSE

-

-/*===========================================================================*/

-/* Kernel parameters.                                                        */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 0//20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/*===========================================================================*/

-/* Performance options.                                                      */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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               FALSE

-#endif

-

-/*===========================================================================*/

-/* Subsystem options.                                                        */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 FALSE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           FALSE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    Mutexes are recommended.

- */

-#if !defined(CH_USE_HEAP) || defined(__DOXYGEN__)

-#define CH_USE_HEAP                     FALSE

-#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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  FALSE

-#endif

-

-/*===========================================================================*/

-/* Debug options.                                                            */

-/*===========================================================================*/

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/*===========================================================================*/

-/* Kernel hooks.                                                             */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F4xx/BKPSRAM/halconf.h b/testhal/STM32F4xx/BKPSRAM/halconf.h
deleted file mode 100644
index f3cd0aa14..000000000
--- a/testhal/STM32F4xx/BKPSRAM/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  TRUE

-#endif

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 TRUE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F4xx/CAN/.cproject b/testhal/STM32F4xx/CAN/.cproject
index 41abe3d02..fb00be23a 100644
--- a/testhal/STM32F4xx/CAN/.cproject
+++ b/testhal/STM32F4xx/CAN/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/CAN/.project b/testhal/STM32F4xx/CAN/.project
index 3c1df9502..91f465f67 100644
--- a/testhal/STM32F4xx/CAN/.project
+++ b/testhal/STM32F4xx/CAN/.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/testhal/STM32F4xx/CAN/Makefile b/testhal/STM32F4xx/CAN/Makefile
index 62d0516f0..12616439a 100644
--- a/testhal/STM32F4xx/CAN/Makefile
+++ b/testhal/STM32F4xx/CAN/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -114,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -139,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -159,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -204,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/CAN/chconf.h b/testhal/STM32F4xx/CAN/chconf.h
index f943ea80c..b6ca0aa69 100644
--- a/testhal/STM32F4xx/CAN/chconf.h
+++ b/testhal/STM32F4xx/CAN/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/CAN/halconf.h b/testhal/STM32F4xx/CAN/halconf.h
index 5b6535967..a1195d7e1 100644
--- a/testhal/STM32F4xx/CAN/halconf.h
+++ b/testhal/STM32F4xx/CAN/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/CAN/main.c b/testhal/STM32F4xx/CAN/main.c
index 8202afe1e..f06bad79f 100644
--- a/testhal/STM32F4xx/CAN/main.c
+++ b/testhal/STM32F4xx/CAN/main.c
@@ -39,21 +39,21 @@ static const CANConfig cancfg = {
 /*

  * Receiver thread.

  */

-static WORKING_AREA(can_rx1_wa, 256);

-static WORKING_AREA(can_rx2_wa, 256);

+static THD_WORKING_AREA(can_rx1_wa, 256);

+static THD_WORKING_AREA(can_rx2_wa, 256);

 static msg_t can_rx(void *p) {

   struct can_instance *cip = p;

-  EventListener el;

+  event_listener_t el;

   CANRxFrame rxmsg;

 

   (void)p;

   chRegSetThreadName("receiver");

   chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-  while(!chThdShouldTerminate()) {

+  while(!chThdShouldTerminateX()) {

     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

       continue;

     while (canReceive(cip->canp, CAN_ANY_MAILBOX,

-                      &rxmsg, TIME_IMMEDIATE) == RDY_OK) {

+                      &rxmsg, TIME_IMMEDIATE) == MSG_OK) {

       /* Process message.*/

       palTogglePad(GPIOD, cip->led);

     }

@@ -65,7 +65,7 @@ static msg_t can_rx(void *p) {
 /*

  * Transmitter thread.

  */

-static WORKING_AREA(can_tx_wa, 256);

+static THD_WORKING_AREA(can_tx_wa, 256);

 static msg_t can_tx(void * p) {

   CANTxFrame txmsg;

 

@@ -78,7 +78,7 @@ static msg_t can_tx(void * p) {
   txmsg.data32[0] = 0x55AA55AA;

   txmsg.data32[1] = 0x00FF00FF;

 

-  while (!chThdShouldTerminate()) {

+  while (!chThdShouldTerminateX()) {

     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     canTransmit(&CAND2, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     chThdSleepMilliseconds(500);

diff --git a/testhal/STM32F4xx/CAN/mcuconf.h b/testhal/STM32F4xx/CAN/mcuconf.h
index 8ceac7c10..4a7490bef 100644
--- a/testhal/STM32F4xx/CAN/mcuconf.h
+++ b/testhal/STM32F4xx/CAN/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC564Axx/SPI/.cproject b/testhal/STM32F4xx/DAC/.cproject
index a4ae17c6d..e05dca097 100644
--- a/testhal/SPC564Axx/SPI/.cproject
+++ b/testhal/STM32F4xx/DAC/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.691815652">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.691815652" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.691815652" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.691815652." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.884342386" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.884342386.339777752" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1729138099" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.146870087" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.605490810" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2132469247" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.936236661" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1782745250" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.670706928" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.417510158" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,13 +39,14 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-SPI.null.1461388361" name="SPC563Mxx-SPI"/>

+		<project id="STM32F4xx-SPI.null.219011718" name="STM32F4xx-SPI"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

+		<scannerConfigBuildInfo instanceId="0.691815652">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/SPC560Dxx/SPI/.project b/testhal/STM32F4xx/DAC/.project
index 7000648ab..02d405ad8 100644
--- a/testhal/SPC560Dxx/SPI/.project
+++ b/testhal/STM32F4xx/DAC/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>SPC560Dxx-SPI</name>

+	<name>STM32F4xx-DAC</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC560D</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F4_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F1xx/GPT/Makefile b/testhal/STM32F4xx/DAC/Makefile
index 0f7e20317..12616439a 100644
--- a/testhal/STM32F1xx/GPT/Makefile
+++ b/testhal/STM32F4xx/DAC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT= $(PORTLD)/STM32F407xG.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,10 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -109,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -120,7 +142,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 # Compiler settings

 #

 

-MCU  = cortex-m3

+MCU  = cortex-m4

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-

@@ -134,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -154,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -199,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/LPC17xx/DAC/chconf.h b/testhal/STM32F4xx/DAC/chconf.h
index f4682cb9d..b6ca0aa69 100644
--- a/testhal/LPC17xx/DAC/chconf.h
+++ b/testhal/STM32F4xx/DAC/chconf.h
@@ -1,531 +1,498 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
+/*

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    templates/chconf.h

+ * @brief   Configuration file template.

+ * @details A copy of this file must be placed in each project directory, it

+ *          contains the application specific kernel settings.

+ *

+ * @addtogroup config

+ * @details Kernel related settings and hooks.

+ * @{

+ */

+

+#ifndef _CHCONF_H_

+#define _CHCONF_H_

+

+/*===========================================================================*/

+/**

+ * @name System timers settings

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

+ * @brief   System tick frequency.

+ * @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

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Round robin interval.

+ * @details This constant is the number of system ticks allowed for the

+ *          threads before preemption occurs. Setting this value to zero

+ *          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.

+ */

+#define CH_CFG_TIME_QUANTUM                 0

+

+/**

+ * @brief   Managed RAM size.

+ * @details Size of the RAM area to be managed by the OS. If set to zero

+ *          then the whole available RAM is used. The core memory is made

+ *          available to the heap allocator and/or can be used directly through

+ *          the simplified core memory allocator.

+ *

+ * @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_CFG_USE_MEMCORE.

+ */

+#define CH_CFG_MEMCORE_SIZE                 0

+

+/**

+ * @brief   Idle thread automatic spawn suppression.

+ * @details When this option is activated the function @p chSysInit()

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Performance options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   OS optimization.

+ * @details If enabled then time efficient rather than space efficient code

+ *          is used when two possible implementations exist.

+ *

+ * @note    This is not related to the compiler optimization options.

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Subsystem options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

+ * @brief   Threads registry APIs.

+ * @details If enabled then the registry APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_REGISTRY                 TRUE

+

+/**

+ * @brief   Threads synchronization APIs.

+ * @details If enabled then the @p chThdWait() function is included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_WAITEXIT                 TRUE

+

+/**

+ * @brief   Semaphores APIs.

+ * @details If enabled then the Semaphores APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_SEMAPHORES               TRUE

+

+/**

+ * @brief   Semaphores queuing mode.

+ * @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_CFG_USE_SEMAPHORES.

+ */

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

+

+/**

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MUTEXES                  TRUE

+

+/**

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

+ *

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

+ */

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

+

+/**

+ * @brief   Conditional Variables APIs.

+ * @details If enabled then the conditional variables APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

+ */

+#define CH_CFG_USE_CONDVARS                 TRUE

+

+/**

+ * @brief   Conditional Variables APIs with timeout.

+ * @details If enabled then the conditional variables APIs with timeout

+ *          specification are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_CONDVARS.

+ */

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

+

+/**

+ * @brief   Events Flags APIs.

+ * @details If enabled then the event flags APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_EVENTS                   TRUE

+

+/**

+ * @brief   Events Flags APIs with timeout.

+ * @details If enabled then the events APIs with timeout specification

+ *          are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_EVENTS.

+ */

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

+

+/**

+ * @brief   Synchronous Messages APIs.

+ * @details If enabled then the synchronous messages APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MESSAGES                 TRUE

+

+/**

+ * @brief   Synchronous Messages queuing mode.

+ * @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_CFG_USE_MESSAGES.

+ */

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

+

+/**

+ * @brief   Mailboxes APIs.

+ * @details If enabled then the asynchronous messages (mailboxes) APIs are

+ *          included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

+ */

+#define CH_CFG_USE_MAILBOXES                TRUE

+

+/**

+ * @brief   I/O Queues APIs.

+ * @details If enabled then the I/O queues APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_QUEUES                   TRUE

+

+/**

+ * @brief   Core Memory Manager APIs.

+ * @details If enabled then the core memory manager APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MEMCORE                  TRUE

+

+/**

+ * @brief   Heap Allocator APIs.

+ * @details If enabled then the memory heap allocator APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or

+ *          @p CH_CFG_USE_SEMAPHORES.

+ * @note    Mutexes are recommended.

+ */

+#define CH_CFG_USE_HEAP                     TRUE

+

+/**

+ * @brief   Memory Pools Allocator APIs.

+ * @details If enabled then the memory pools allocator APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MEMPOOLS                 TRUE

+

+/**

+ * @brief   Dynamic Threads APIs.

+ * @details If enabled then the dynamic threads creation APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_WAITEXIT.

+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.

+ */

+#define CH_CFG_USE_DYNAMIC                  TRUE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Debug options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

+ * @brief   Debug option, system state check.

+ * @details If enabled the correct call protocol for system APIs is checked

+ *          at runtime.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

+

+/**

+ * @brief   Debug option, parameters checks.

+ * @details If enabled then the checks on the API functions input

+ *          parameters are activated.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_ENABLE_CHECKS                TRUE

+

+/**

+ * @brief   Debug option, consistency checks.

+ * @details If enabled then all the assertions in the kernel code are

+ *          activated. This includes consistency checks inside the kernel,

+ *          runtime anomalies and port-defined checks.

+ *

+ * @note    The default is @p 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.

+ */

+#define CH_DBG_ENABLE_TRACE                 TRUE

+

+/**

+ * @brief   Debug option, stack checks.

+ * @details If enabled then a runtime stack check is performed.

+ *

+ * @note    The default is @p FALSE.

+ * @note    The stack check is performed in a architecture/port dependent way.

+ *          It may not be implemented or some ports.

+ * @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           TRUE

+

+/**

+ * @brief   Debug option, stacks initialization.

+ * @details If enabled then the threads working area is filled with a byte

+ *          value when a thread is created. This can be useful for the

+ *          runtime measurement of the used stack.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_FILL_THREADS                 TRUE

+

+/**

+ * @brief   Debug option, threads profiling.

+ * @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 FALSE.

+ * @note    This debug option is not currently compatible with the

+ *          tickless mode.

+ */

+#define CH_DBG_THREADS_PROFILING            FALSE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel hooks

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Threads descriptor structure extension.

+ * @details User fields added to the end of the @p thread_t structure.

+ */

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

+  /* Add threads custom fields here.*/

+

+/**

+ * @brief   Threads initialization hook.

+ * @details User initialization code added to the @p chThdInit() API.

+ *

+ * @note    It is invoked from within @p chThdInit() and implicitly from all

+ *          the threads creation APIs.

+ */

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

+  /* Add threads initialization code here.*/                                \

+}

+

+/**

+ * @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.*/                                  \

+}

+

+/**

+ * @brief   Context switch hook.

+ * @details This hook is invoked just before switching between threads.

+ */

+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

+  /* System halt 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() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

+

+/**

+ * @brief   Idle Loop hook.

+ * @details This hook is continuously invoked by the idle thread loop.

+ */

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

+  /* Idle loop code here.*/                                                 \

+}

+

+/**

+ * @brief   System tick event hook.

+ * @details This hook is invoked in the system tick handler immediately

+ *          after processing the virtual timers queue.

+ */

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

+  /* System tick event code here.*/                                         \

+}

+

+/**

+ * @brief   System halt hook.

+ * @details This hook is invoked in case to a system halting error before

+ *          the system is halted.

+ */

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

+  /* System halt code here.*/                                               \

+}

+

+/** @} */

+

+/*===========================================================================*/

+/* Port-specific settings (override port settings defaulted in chcore.h).    */

+/*===========================================================================*/

+

+#endif  /* _CHCONF_H_ */

+

+/** @} */

diff --git a/testhal/SPC560Dxx/SPI/halconf.h b/testhal/STM32F4xx/DAC/halconf.h
index fdc079aef..dc8857ac7 100644
--- a/testhal/SPC560Dxx/SPI/halconf.h
+++ b/testhal/STM32F4xx/DAC/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__)

@@ -59,6 +52,13 @@
 #endif

 

 /**

+ * @brief   Enables the DAC subsystem.

+ */

+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)

+#define HAL_USE_DAC                 TRUE

+#endif

+

+/**

  * @brief   Enables the EXT subsystem.

  */

 #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

@@ -139,7 +146,7 @@
  * @brief   Enables the SPI subsystem.

  */

 #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

+#define HAL_USE_SPI                 FALSE

 #endif

 

 /**

diff --git a/testhal/AVR/GPT/main.c b/testhal/STM32F4xx/DAC/main.c
index a6d6b6364..10da042ed 100644
--- a/testhal/AVR/GPT/main.c
+++ b/testhal/STM32F4xx/DAC/main.c
@@ -16,18 +16,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "chprintf.h"

-

-static void gpt2cb(GPTDriver *gptp)

-{

-  palTogglePad(IOPORT2, 7);

-}

-

-static GPTConfig gpt2cfg =

-{

-  1000,         /* Timer clock.    */

-  gpt2cb        /* Timer callback. */

-};

 

 /*

  * Application entry point.

@@ -41,23 +29,15 @@ int main(void) {
    * - Kernel initialization, the main() function becomes a thread and the

    *   RTOS is active.

    */

-

   halInit();

   chSysInit();

 

-  palSetPadMode(IOPORT2, 7, PAL_MODE_OUTPUT_PUSHPULL);

-

-  sdStart(&SD1, NULL);

-  gptStart(&GPTD1, &gpt2cfg);

-

-  gptStartContinuous(&GPTD1, 500);

-  while (1) {

-    chprintf(&SD1, "OCR1A: %d, TCCR1B: %x, period: %d, counter: %d , TCNT1: %d\r\n",

-                   OCR1A,

-                   TCCR1B,

-                   GPTD1.period,

-                   GPTD1.counter,

-                   TCNT1);

-    chThdSleepMilliseconds(100);

+  /*

+   * Normal main() thread activity, if the button is pressed then the I2s

+   * transfer is stopped.

+   */

+  while (TRUE) {

+    chThdSleepMilliseconds(500);

   }

+  return 0;

 }

diff --git a/testhal/STM32F4xx/BKPSRAM/mcuconf.h b/testhal/STM32F4xx/DAC/mcuconf.h
index fd1c54a3d..c9c5681ac 100644
--- a/testhal/STM32F4xx/BKPSRAM/mcuconf.h
+++ b/testhal/STM32F4xx/DAC/mcuconf.h
@@ -37,7 +37,7 @@
 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_CLOCK48_REQUIRED              TRUE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

@@ -48,18 +48,18 @@
 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE1                         STM32_PPRE1_DIV4

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

-#define STM32_RTCSEL                        STM32_RTCSEL_LSE

+#define STM32_RTCSEL                        STM32_RTCSEL_LSI

 #define STM32_RTCPRE_VALUE                  8

 #define STM32_MCO1SEL                       STM32_MCO1SEL_HSI

 #define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1

 #define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK

 #define STM32_MCO2PRE                       STM32_MCO2PRE_DIV5

-#define STM32_I2SSRC                        STM32_I2SSRC_CKIN

+#define STM32_I2SSRC                        STM32_I2SSRC_PLLI2S

 #define STM32_PLLI2SN_VALUE                 192

 #define STM32_PLLI2SR_VALUE                 5

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

-#define STM32_BKPRAM_ENABLE                 TRUE

+#define STM32_BKPRAM_ENABLE                 FALSE

 

 /*

  * ADC driver system settings.

@@ -88,6 +88,19 @@
 #define STM32_CAN_CAN2_IRQ_PRIORITY         11

 

 /*

+ * DAC driver system settings.

+ */

+#define STM32_DAC_USE_CHN1                  TRUE

+#define STM32_DAC_USE_CHN2                  FALSE

+#define STM32_DAC_CHN1_IRQ_PRIORITY         10

+#define STM32_DAC_CHN2_IRQ_PRIORITY         10

+#define STM32_DAC_CHN1_DMA_PRIORITY         2

+#define STM32_DAC_CHN2_DMA_PRIORITY         2

+#define STM32_DAC_DMA_ERROR_HOOK(dacp)      osalSysHalt()

+#define STM32_DAC_CHN1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 3)

+#define STM32_DAC_CHN2_DMA_STREAM           STM32_DMA_STREAM_ID(1, 4)

+

+/*

  * EXT driver system settings.

  */

 #define STM32_EXT_EXTI0_IRQ_PRIORITY        6

@@ -139,6 +152,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +165,22 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

+

+/*

+ * I2S driver system settings.

+ */

+#define STM32_I2S_USE_SPI2                  FALSE

+#define STM32_I2S_USE_SPI3                  FALSE

+#define STM32_I2S_SPI2_IRQ_PRIORITY         10

+#define STM32_I2S_SPI3_IRQ_PRIORITY         10

+#define STM32_I2S_SPI2_DMA_PRIORITY         1

+#define STM32_I2S_SPI3_DMA_PRIORITY         1

+#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_I2S_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

+#define STM32_I2S_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)

+#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,10 +231,21 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -237,7 +275,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +316,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/RTC_FATTIME/readme.txt b/testhal/STM32F4xx/DAC/readme.txt
index 0d7b112ee..f1273c649 100644
--- a/testhal/STM32F1xx/RTC_FATTIME/readme.txt
+++ b/testhal/STM32F4xx/DAC/readme.txt
@@ -1,14 +1,18 @@
 *****************************************************************************

-** ChibiOS/RT HAL - USB-CDC driver demo for STM32.                         **

+** ChibiOS/RT HAL - DAC driver demo for STM32F4xx.                         **

 *****************************************************************************

 

 ** TARGET **

 

-The demo runs on an Olimex STM32-P103 board.

+The demo runs on an ST STM32F4-Discovery board.

 

 ** The Demo **

 

-The application demonstrates checks timestamp correctness on FAT.

+The application demonstrates the use of the STM32F4xx DAC driver.

+

+** Board Setup **

+

+None.

 

 ** Build Procedure **

 

diff --git a/testhal/STM32F4xx/DMA_STORM/.project b/testhal/STM32F4xx/DMA_STORM/.project
index fdacc2794..9841eee9f 100644
--- a/testhal/STM32F4xx/DMA_STORM/.project
+++ b/testhal/STM32F4xx/DMA_STORM/.project
@@ -27,7 +27,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/testhal/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32F4xx/DMA_STORM/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/DMA_STORM/Makefile
+++ b/testhal/STM32F4xx/DMA_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/DMA_STORM/chconf.h b/testhal/STM32F4xx/DMA_STORM/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/DMA_STORM/chconf.h
+++ b/testhal/STM32F4xx/DMA_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/DMA_STORM/halconf.h b/testhal/STM32F4xx/DMA_STORM/halconf.h
index e2b440694..09ca1aaad 100644
--- a/testhal/STM32F4xx/DMA_STORM/halconf.h
+++ b/testhal/STM32F4xx/DMA_STORM/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/DMA_STORM/main.c b/testhal/STM32F4xx/DMA_STORM/main.c
index a3193fcc1..e334e6a67 100644
--- a/testhal/STM32F4xx/DMA_STORM/main.c
+++ b/testhal/STM32F4xx/DMA_STORM/main.c
@@ -35,7 +35,7 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {
 

   (void)adcp;

   (void)err;

-  chSysHalt();

+  chSysHalt("ADC error");

 }

 

 /*

@@ -73,22 +73,24 @@ static const SPIConfig hs_spicfg = {
 static void tmo(void *p) {

 

   (void)p;

-  chSysHalt();

+  chSysHalt("timeout");

 }

 

 /*

  * SPI thread.

  */

-static WORKING_AREA(waSPI1, 1024);

-static WORKING_AREA(waSPI2, 1024);

-static WORKING_AREA(waSPI3, 1024);

+static THD_WORKING_AREA(waSPI1, 1024);

+static THD_WORKING_AREA(waSPI2, 1024);

+static THD_WORKING_AREA(waSPI3, 1024);

 static msg_t spi_thread(void *p) {

   unsigned i;

   SPIDriver *spip = (SPIDriver *)p;

-  VirtualTimer vt;

+  virtual_timer_t vt;

   uint8_t txbuf[256];

   uint8_t rxbuf[256];

 

+  chVTObjectInit(&vt);

+

   /* Prepare transmit pattern.*/

   for (i = 0; i < sizeof(txbuf); i++)

     txbuf[i] = (uint8_t)i;

@@ -97,17 +99,12 @@ static msg_t spi_thread(void *p) {
   while (TRUE) {

     /* Starts a VT working as watchdog to catch a malfunction in the SPI

        driver.*/

-    chSysLock();

-    chVTSetI(&vt, MS2ST(10), tmo, NULL);

-    chSysUnlock();

+    chVTSet(&vt, MS2ST(10), tmo, NULL);

 

     spiExchange(spip, sizeof(txbuf), txbuf, rxbuf);

 

     /* Stops the watchdog.*/

-    chSysLock();

-    if (chVTIsArmedI(&vt))

-      chVTResetI(&vt);

-    chSysUnlock();

+    chVTReset(&vt);

   }

 }

 

@@ -115,7 +112,7 @@ static msg_t spi_thread(void *p) {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

@@ -166,9 +163,9 @@ int main(void) {
 

   /* Allocating two DMA2 streams for memory copy operations.*/

   if (dmaStreamAllocate(STM32_DMA2_STREAM6, 0, NULL, NULL))

-    chSysHalt();

+    chSysHalt("DMA already in use");

   if (dmaStreamAllocate(STM32_DMA2_STREAM7, 0, NULL, NULL))

-    chSysHalt();

+    chSysHalt("DMA already in use");

   for (i = 0; i < sizeof (patterns1); i++)

     patterns1[i] = (uint8_t)i;

   for (i = 0; i < sizeof (patterns2); i++)

@@ -177,13 +174,13 @@ int main(void) {
   /* Normal main() thread activity, it does continues memory copy operations

      using 2 DMA streams at the lowest priority.*/

   while (TRUE) {

-    VirtualTimer vt;

+    virtual_timer_t vt;

+

+    chVTObjectInit(&vt);

 

     /* Starts a VT working as watchdog to catch a malfunction in the DMA

        driver.*/

-    chSysLock();

-    chVTSetI(&vt, MS2ST(10), tmo, NULL);

-    chSysUnlock();

+    chVTSet(&vt, MS2ST(10), tmo, NULL);

 

     /* Copy pattern 1.*/

     dmaStartMemCopy(STM32_DMA2_STREAM6,

@@ -197,9 +194,9 @@ int main(void) {
     dmaWaitCompletion(STM32_DMA2_STREAM6);

     dmaWaitCompletion(STM32_DMA2_STREAM7);

     if (memcmp(patterns1, buf1, sizeof (patterns1)))

-      chSysHalt();

+      chSysHalt("pattern error");

     if (memcmp(patterns1, buf2, sizeof (patterns1)))

-      chSysHalt();

+      chSysHalt("pattern error");

 

     /* Copy pattern 2.*/

     dmaStartMemCopy(STM32_DMA2_STREAM6,

@@ -213,15 +210,12 @@ int main(void) {
     dmaWaitCompletion(STM32_DMA2_STREAM6);

     dmaWaitCompletion(STM32_DMA2_STREAM7);

     if (memcmp(patterns2, buf1, sizeof (patterns2)))

-      chSysHalt();

+      chSysHalt("pattern error");

     if (memcmp(patterns2, buf2, sizeof (patterns2)))

-      chSysHalt();

+      chSysHalt("pattern error");

 

     /* Stops the watchdog.*/

-    chSysLock();

-    if (chVTIsArmedI(&vt))

-      chVTResetI(&vt);

-    chSysUnlock();

+    chVTReset(&vt);

 

     chThdSleepMilliseconds(2);

   }

diff --git a/testhal/STM32F4xx/DMA_STORM/mcuconf.h b/testhal/STM32F4xx/DMA_STORM/mcuconf.h
index 5de616c27..a7eb46af3 100644
--- a/testhal/STM32F4xx/DMA_STORM/mcuconf.h
+++ b/testhal/STM32F4xx/DMA_STORM/mcuconf.h
@@ -82,8 +82,8 @@
 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  FALSE

-#define STM32_CAN_USE_CAN2                  FALSE

+#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN2                  TRUE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 #define STM32_CAN_CAN2_IRQ_PRIORITY         11

 

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/EXT/.cproject b/testhal/STM32F4xx/EXT/.cproject
index 59e262be9..b7cb49ea0 100644
--- a/testhal/STM32F4xx/EXT/.cproject
+++ b/testhal/STM32F4xx/EXT/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/EXT/.project b/testhal/STM32F4xx/EXT/.project
index b4ae995c3..5e621fa15 100644
--- a/testhal/STM32F4xx/EXT/.project
+++ b/testhal/STM32F4xx/EXT/.project
@@ -27,7 +27,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/testhal/STM32F4xx/EXT/Makefile b/testhal/STM32F4xx/EXT/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/EXT/Makefile
+++ b/testhal/STM32F4xx/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/EXT/chconf.h b/testhal/STM32F4xx/EXT/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/EXT/chconf.h
+++ b/testhal/STM32F4xx/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/EXT/halconf.h b/testhal/STM32F4xx/EXT/halconf.h
index e0e0c38ff..5b67db37b 100644
--- a/testhal/STM32F4xx/EXT/halconf.h
+++ b/testhal/STM32F4xx/EXT/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/EXT/main.c b/testhal/STM32F4xx/EXT/main.c
index 1bdce5a09..2963f52a1 100644
--- a/testhal/STM32F4xx/EXT/main.c
+++ b/testhal/STM32F4xx/EXT/main.c
@@ -25,19 +25,18 @@ static void led5off(void *arg) {
 

 /* Triggered when the button is pressed or released. The LED5 is set to ON.*/

 static void extcb1(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

+  static virtual_timer_t vt4;

 

   (void)extp;

   (void)channel;

 

   palSetPad(GPIOD, GPIOD_LED5);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  chSysLockFromISR();

+  chVTResetI(&vt4);

 

   /* LED4 set to OFF after 200mS.*/

   chVTSetI(&vt4, MS2ST(200), led5off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static const EXTConfig extcfg = {

diff --git a/testhal/STM32F4xx/EXT/mcuconf.h b/testhal/STM32F4xx/EXT/mcuconf.h
index 9e2e53fe3..81031a79a 100644
--- a/testhal/STM32F4xx/EXT/mcuconf.h
+++ b/testhal/STM32F4xx/EXT/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/GPT/.cproject b/testhal/STM32F4xx/GPT/.cproject
index 4933adfbb..11c951acb 100644
--- a/testhal/STM32F4xx/GPT/.cproject
+++ b/testhal/STM32F4xx/GPT/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/GPT/.project b/testhal/STM32F4xx/GPT/.project
index 90014959c..89464dd13 100644
--- a/testhal/STM32F4xx/GPT/.project
+++ b/testhal/STM32F4xx/GPT/.project
@@ -27,7 +27,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/testhal/STM32F4xx/GPT/Makefile b/testhal/STM32F4xx/GPT/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/GPT/Makefile
+++ b/testhal/STM32F4xx/GPT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/GPT/chconf.h b/testhal/STM32F4xx/GPT/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/GPT/chconf.h
+++ b/testhal/STM32F4xx/GPT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/GPT/halconf.h b/testhal/STM32F4xx/GPT/halconf.h
index 554b4e9ca..fa562add8 100644
--- a/testhal/STM32F4xx/GPT/halconf.h
+++ b/testhal/STM32F4xx/GPT/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/GPT/main.c b/testhal/STM32F4xx/GPT/main.c
index a95d5fe81..88fb58e7d 100644
--- a/testhal/STM32F4xx/GPT/main.c
+++ b/testhal/STM32F4xx/GPT/main.c
@@ -20,13 +20,13 @@
 /*

  * GPT2 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

 

   (void)gptp;

   palSetPad(GPIOD, GPIOD_LED5);

-  chSysLockFromIsr();

+  chSysLockFromISR();

   gptStartOneShotI(&GPTD3, 1000);   /* 0.1 second pulse.*/

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -41,9 +41,10 @@ static void gpt3cb(GPTDriver *gptp) {
 /*

  * GPT2 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt4cfg = {

   10000,    /* 10kHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -53,6 +54,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   10000,    /* 10kHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -74,8 +76,8 @@ int main(void) {
   /*

    * Initializes the GPT drivers 2 and 3.

    */

-  gptStart(&GPTD2, &gpt2cfg);

-  gptPolledDelay(&GPTD2, 10); /* Small delay.*/

+  gptStart(&GPTD4, &gpt4cfg);

+  gptPolledDelay(&GPTD4, 10); /* Small delay.*/

   gptStart(&GPTD3, &gpt3cfg);

   gptPolledDelay(&GPTD3, 10); /* Small delay.*/

 

@@ -85,12 +87,12 @@ int main(void) {
    */

   while (TRUE) {

     palSetPad(GPIOD, GPIOD_LED4);

-    gptStartContinuous(&GPTD2, 5000);

+    gptStartContinuous(&GPTD4, 5000);

     chThdSleepMilliseconds(5000);

-    gptStopTimer(&GPTD2);

+    gptStopTimer(&GPTD4);

     palClearPad(GPIOD, GPIOD_LED4);

-    gptStartContinuous(&GPTD2, 2500);

+    gptStartContinuous(&GPTD4, 2500);

     chThdSleepMilliseconds(5000);

-    gptStopTimer(&GPTD2);

+    gptStopTimer(&GPTD4);

   }

 }

diff --git a/testhal/STM32F4xx/GPT/mcuconf.h b/testhal/STM32F4xx/GPT/mcuconf.h
index 432d85667..d238f12d1 100644
--- a/testhal/STM32F4xx/GPT/mcuconf.h
+++ b/testhal/STM32F4xx/GPT/mcuconf.h
@@ -109,7 +109,7 @@
  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  TRUE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

 #define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  TRUE

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/I2C/.cproject b/testhal/STM32F4xx/I2C/.cproject
index 5effe9a53..8ceae86ea 100644
--- a/testhal/STM32F4xx/I2C/.cproject
+++ b/testhal/STM32F4xx/I2C/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/I2C/.project b/testhal/STM32F4xx/I2C/.project
index c506abb10..a3b5ed440 100644
--- a/testhal/STM32F4xx/I2C/.project
+++ b/testhal/STM32F4xx/I2C/.project
@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/NONSTANDARD_STM32F4_BARTHESS1</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F4xx/I2C/Makefile b/testhal/STM32F4xx/I2C/Makefile
index d52f5d4e8..609ed9012 100644
--- a/testhal/STM32F4xx/I2C/Makefile
+++ b/testhal/STM32F4xx/I2C/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/I2C/chconf.h b/testhal/STM32F4xx/I2C/chconf.h
index 9357b698c..b6ca0aa69 100644
--- a/testhal/STM32F4xx/I2C/chconf.h
+++ b/testhal/STM32F4xx/I2C/chconf.h
@@ -28,21 +28,44 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

-//#define CORTEX_VTOR_INIT       0x000E0000

-#define CORTEX_VTOR_INIT  0x00000000

-

 /*===========================================================================*/

-/* Kernel parameters.                                                        */

+/**

+ * @name System timers settings

+ * @{

+ */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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                 0//20

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,31 +90,25 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

+

+/** @} */

 

 /*===========================================================================*/

-/* Performance options.                                                      */

+/**

+ * @name Performance options

+ * @{

+ */

 /*===========================================================================*/

 

 /**

@@ -103,23 +119,33 @@
  * @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               FALSE

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

+

+/** @} */

 

 /*===========================================================================*/

-/* Subsystem options.                                                        */

+/**

+ * @name Subsystem options

+ * @{

+ */

 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -128,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -138,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -182,11 +199,9 @@
  *          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                 FALSE

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -194,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -206,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -216,11 +227,9 @@
  *          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           FALSE

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -229,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -251,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -263,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -274,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -284,27 +284,11 @@
  *          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                     FALSE

-#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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -313,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -323,16 +305,27 @@
  *          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                  FALSE

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

+

+/** @} */

 

 /*===========================================================================*/

-/* Debug options.                                                            */

+/**

+ * @name Debug options

+ * @{

+ */

 /*===========================================================================*/

+

+/**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

 /**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

@@ -340,9 +333,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -351,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -363,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -374,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -388,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -400,35 +383,34 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

+

+/** @} */

 

 /*===========================================================================*/

-/* Kernel hooks.                                                             */

+/**

+ * @name Kernel hooks

+ * @{

+ */

 /*===========================================================================*/

 

 /**

  * @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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -437,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -451,53 +431,63 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

+

+/** @} */

 

 /*===========================================================================*/

 /* Port-specific settings (override port settings defaulted in chcore.h).    */

diff --git a/testhal/STM32F4xx/I2C/halconf.h b/testhal/STM32F4xx/I2C/halconf.h
index 8f77e1d4a..ae69b9284 100644
--- a/testhal/STM32F4xx/I2C/halconf.h
+++ b/testhal/STM32F4xx/I2C/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -62,7 +55,7 @@
  * @brief   Enables the EXT subsystem.

  */

 #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 TRUE

+#define HAL_USE_EXT                 FALSE

 #endif

 

 /**

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/I2C/main.c b/testhal/STM32F4xx/I2C/main.c
index e83a98ffd..b90feb138 100644
--- a/testhal/STM32F4xx/I2C/main.c
+++ b/testhal/STM32F4xx/I2C/main.c
@@ -109,7 +109,7 @@ static const I2CConfig i2cfg2 = {
  * Application entry point.

  */

 int main(void) {

-  msg_t status = RDY_OK;

+  msg_t status = MSG_OK;

   systime_t tmo = MS2ST(4);

 

   /*

@@ -143,7 +143,7 @@ int main(void) {
   status = i2cMasterTransmitTimeout(&I2CD2, mma8451_addr, txbuf, 2, rxbuf, 0, tmo);

   i2cReleaseBus(&I2CD2);

 

-  if (status != RDY_OK){

+  if (status != MSG_OK){

     errors = i2cGetErrors(&I2CD2);

   }

 

@@ -159,7 +159,7 @@ int main(void) {
     status = i2cMasterTransmitTimeout(&I2CD2, mma8451_addr, txbuf, 1, rxbuf, 6, tmo);

     i2cReleaseBus(&I2CD2);

 

-    if (status != RDY_OK){

+    if (status != MSG_OK){

       errors = i2cGetErrors(&I2CD2);

     }

 

diff --git a/testhal/STM32F4xx/I2C/mcuconf.h b/testhal/STM32F4xx/I2C/mcuconf.h
index d0f9066b8..b7813c529 100644
--- a/testhal/STM32F4xx/I2C/mcuconf.h
+++ b/testhal/STM32F4xx/I2C/mcuconf.h
@@ -108,7 +108,7 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  FALSE

+#define STM32_GPT_USE_TIM1                  TRUE

 #define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  FALSE

 #define STM32_GPT_USE_TIM4                  FALSE

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  TRUE

 #define STM32_I2C_USE_I2C2                  TRUE

 #define STM32_I2C_USE_I2C3                  TRUE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/SPC563Mxx/SPI/.cproject b/testhal/STM32F4xx/I2S/.cproject
index a4ae17c6d..e05dca097 100644
--- a/testhal/SPC563Mxx/SPI/.cproject
+++ b/testhal/STM32F4xx/I2S/.cproject
@@ -3,8 +3,8 @@
 

 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

-		<cconfiguration id="0.861226640">

-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.861226640" moduleId="org.eclipse.cdt.core.settings" name="Default">

+		<cconfiguration id="0.691815652">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.691815652" moduleId="org.eclipse.cdt.core.settings" name="Default">

 				<externalSettings/>

 				<extensions>

 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

@@ -16,20 +16,20 @@
 				</extensions>

 			</storageModule>

 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.861226640" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

-					<folderInfo id="0.861226640." name="/" resourcePath="">

-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1002748249.660222523" name=""/>

-							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.662368067" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1194892762" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1089722463" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1861343146" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.691815652" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.691815652." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.884342386" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.884342386.339777752" name=""/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1729138099" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.146870087" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.605490810" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2132469247" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1644189815" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1045400342" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.936236661" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1782745250" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

-							<tool id="org.eclipse.cdt.build.core.settings.holder.1188847444" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.263638018" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.670706928" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.417510158" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

 							</tool>

 						</toolChain>

 					</folderInfo>

@@ -39,13 +39,14 @@
 		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

-		<project id="SPC563Mxx-SPI.null.1461388361" name="SPC563Mxx-SPI"/>

+		<project id="STM32F4xx-SPI.null.219011718" name="STM32F4xx-SPI"/>

 	</storageModule>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.861226640">

+		<scannerConfigBuildInfo instanceId="0.691815652">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/SPC560Pxx/CAN/.project b/testhal/STM32F4xx/I2S/.project
index 4c2d806c5..a3373c0bf 100644
--- a/testhal/SPC560Pxx/CAN/.project
+++ b/testhal/STM32F4xx/I2S/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>SPC560Pxx-PWM-ICU</name>

+	<name>STM32F4xx-I2S</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -27,7 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_EVB_SPC560P</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F4_DISCOVERY</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F1xx/USB_MSC/Makefile b/testhal/STM32F4xx/I2S/Makefile
index 1f76375fe..12616439a 100644
--- a/testhal/STM32F1xx/USB_MSC/Makefile
+++ b/testhal/STM32F4xx/I2S/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT= $(PORTLD)/STM32F407xG.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -75,11 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/usb_msc.c \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -110,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -121,7 +142,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 # Compiler settings

 #

 

-MCU  = cortex-m3

+MCU  = cortex-m4

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-

@@ -135,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -155,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -200,11 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/LPC17xx/CAN/chconf.h b/testhal/STM32F4xx/I2S/chconf.h
index f4682cb9d..b6ca0aa69 100644
--- a/testhal/LPC17xx/CAN/chconf.h
+++ b/testhal/STM32F4xx/I2S/chconf.h
@@ -1,531 +1,498 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_FREQUENCY                    1000
-#endif
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          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.
- */
-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_TIME_QUANTUM                 20
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @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.
- */
-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)
-#define CH_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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @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
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @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
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)
-#define CH_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)
-#define CH_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @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.
- */
-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)
-#define CH_USE_SEMSW                    TRUE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)
-#define CH_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_MUTEXES.
- */
-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_CONDVARS.
- */
-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_EVENTS.
- */
-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)
-#define CH_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @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.
- */
-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_USE_SEMAPHORES.
- */
-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)
-#define CH_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)
-#define CH_USE_QUEUES                   TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)
-#define CH_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          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    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
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)
-#define CH_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          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.
- */
-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
-#define CH_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @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) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#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
- *          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.
- */
-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)
-#define CH_DBG_THREADS_PROFILING        TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p Thread structure.
- */
-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)
-#define THREAD_EXT_FIELDS                                                   \
-  /* Add threads custom fields here.*/
-#endif
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @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) {                                          \
-  /* Add threads initialization code here.*/                                \
-}
-#endif
-
-/**
- * @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.
- */
-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)
-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \
-  /* Add threads finalization code here.*/                                  \
-}
-#endif
-
-/**
- * @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) {                              \
-  /* System halt code here.*/                                               \
-}
-#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() {                                                  \
-  /* Idle loop code here.*/                                                 \
-}
-#endif
-
-/**
- * @brief   System tick event hook.
- * @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() {                                          \
-  /* System tick event code here.*/                                         \
-}
-#endif
-
-/**
- * @brief   System halt hook.
- * @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() {                                                \
-  /* System halt code here.*/                                               \
-}
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* _CHCONF_H_ */
-
-/** @} */
+/*

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    templates/chconf.h

+ * @brief   Configuration file template.

+ * @details A copy of this file must be placed in each project directory, it

+ *          contains the application specific kernel settings.

+ *

+ * @addtogroup config

+ * @details Kernel related settings and hooks.

+ * @{

+ */

+

+#ifndef _CHCONF_H_

+#define _CHCONF_H_

+

+/*===========================================================================*/

+/**

+ * @name System timers settings

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

+ * @brief   System tick frequency.

+ * @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

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Round robin interval.

+ * @details This constant is the number of system ticks allowed for the

+ *          threads before preemption occurs. Setting this value to zero

+ *          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.

+ */

+#define CH_CFG_TIME_QUANTUM                 0

+

+/**

+ * @brief   Managed RAM size.

+ * @details Size of the RAM area to be managed by the OS. If set to zero

+ *          then the whole available RAM is used. The core memory is made

+ *          available to the heap allocator and/or can be used directly through

+ *          the simplified core memory allocator.

+ *

+ * @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_CFG_USE_MEMCORE.

+ */

+#define CH_CFG_MEMCORE_SIZE                 0

+

+/**

+ * @brief   Idle thread automatic spawn suppression.

+ * @details When this option is activated the function @p chSysInit()

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Performance options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   OS optimization.

+ * @details If enabled then time efficient rather than space efficient code

+ *          is used when two possible implementations exist.

+ *

+ * @note    This is not related to the compiler optimization options.

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Subsystem options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

+ * @brief   Threads registry APIs.

+ * @details If enabled then the registry APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_REGISTRY                 TRUE

+

+/**

+ * @brief   Threads synchronization APIs.

+ * @details If enabled then the @p chThdWait() function is included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_WAITEXIT                 TRUE

+

+/**

+ * @brief   Semaphores APIs.

+ * @details If enabled then the Semaphores APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_SEMAPHORES               TRUE

+

+/**

+ * @brief   Semaphores queuing mode.

+ * @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_CFG_USE_SEMAPHORES.

+ */

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

+

+/**

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MUTEXES                  TRUE

+

+/**

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

+ *

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

+ */

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

+

+/**

+ * @brief   Conditional Variables APIs.

+ * @details If enabled then the conditional variables APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

+ */

+#define CH_CFG_USE_CONDVARS                 TRUE

+

+/**

+ * @brief   Conditional Variables APIs with timeout.

+ * @details If enabled then the conditional variables APIs with timeout

+ *          specification are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_CONDVARS.

+ */

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

+

+/**

+ * @brief   Events Flags APIs.

+ * @details If enabled then the event flags APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_EVENTS                   TRUE

+

+/**

+ * @brief   Events Flags APIs with timeout.

+ * @details If enabled then the events APIs with timeout specification

+ *          are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_EVENTS.

+ */

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

+

+/**

+ * @brief   Synchronous Messages APIs.

+ * @details If enabled then the synchronous messages APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MESSAGES                 TRUE

+

+/**

+ * @brief   Synchronous Messages queuing mode.

+ * @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_CFG_USE_MESSAGES.

+ */

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

+

+/**

+ * @brief   Mailboxes APIs.

+ * @details If enabled then the asynchronous messages (mailboxes) APIs are

+ *          included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

+ */

+#define CH_CFG_USE_MAILBOXES                TRUE

+

+/**

+ * @brief   I/O Queues APIs.

+ * @details If enabled then the I/O queues APIs are included in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_QUEUES                   TRUE

+

+/**

+ * @brief   Core Memory Manager APIs.

+ * @details If enabled then the core memory manager APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MEMCORE                  TRUE

+

+/**

+ * @brief   Heap Allocator APIs.

+ * @details If enabled then the memory heap allocator APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or

+ *          @p CH_CFG_USE_SEMAPHORES.

+ * @note    Mutexes are recommended.

+ */

+#define CH_CFG_USE_HEAP                     TRUE

+

+/**

+ * @brief   Memory Pools Allocator APIs.

+ * @details If enabled then the memory pools allocator APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_MEMPOOLS                 TRUE

+

+/**

+ * @brief   Dynamic Threads APIs.

+ * @details If enabled then the dynamic threads creation APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ * @note    Requires @p CH_CFG_USE_WAITEXIT.

+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.

+ */

+#define CH_CFG_USE_DYNAMIC                  TRUE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Debug options

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

+ * @brief   Debug option, system state check.

+ * @details If enabled the correct call protocol for system APIs is checked

+ *          at runtime.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

+

+/**

+ * @brief   Debug option, parameters checks.

+ * @details If enabled then the checks on the API functions input

+ *          parameters are activated.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_ENABLE_CHECKS                TRUE

+

+/**

+ * @brief   Debug option, consistency checks.

+ * @details If enabled then all the assertions in the kernel code are

+ *          activated. This includes consistency checks inside the kernel,

+ *          runtime anomalies and port-defined checks.

+ *

+ * @note    The default is @p 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.

+ */

+#define CH_DBG_ENABLE_TRACE                 TRUE

+

+/**

+ * @brief   Debug option, stack checks.

+ * @details If enabled then a runtime stack check is performed.

+ *

+ * @note    The default is @p FALSE.

+ * @note    The stack check is performed in a architecture/port dependent way.

+ *          It may not be implemented or some ports.

+ * @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           TRUE

+

+/**

+ * @brief   Debug option, stacks initialization.

+ * @details If enabled then the threads working area is filled with a byte

+ *          value when a thread is created. This can be useful for the

+ *          runtime measurement of the used stack.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_FILL_THREADS                 TRUE

+

+/**

+ * @brief   Debug option, threads profiling.

+ * @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 FALSE.

+ * @note    This debug option is not currently compatible with the

+ *          tickless mode.

+ */

+#define CH_DBG_THREADS_PROFILING            FALSE

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel hooks

+ * @{

+ */

+/*===========================================================================*/

+

+/**

+ * @brief   Threads descriptor structure extension.

+ * @details User fields added to the end of the @p thread_t structure.

+ */

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

+  /* Add threads custom fields here.*/

+

+/**

+ * @brief   Threads initialization hook.

+ * @details User initialization code added to the @p chThdInit() API.

+ *

+ * @note    It is invoked from within @p chThdInit() and implicitly from all

+ *          the threads creation APIs.

+ */

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

+  /* Add threads initialization code here.*/                                \

+}

+

+/**

+ * @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.*/                                  \

+}

+

+/**

+ * @brief   Context switch hook.

+ * @details This hook is invoked just before switching between threads.

+ */

+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

+  /* System halt 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() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

+

+/**

+ * @brief   Idle Loop hook.

+ * @details This hook is continuously invoked by the idle thread loop.

+ */

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

+  /* Idle loop code here.*/                                                 \

+}

+

+/**

+ * @brief   System tick event hook.

+ * @details This hook is invoked in the system tick handler immediately

+ *          after processing the virtual timers queue.

+ */

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

+  /* System tick event code here.*/                                         \

+}

+

+/**

+ * @brief   System halt hook.

+ * @details This hook is invoked in case to a system halting error before

+ *          the system is halted.

+ */

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

+  /* System halt code here.*/                                               \

+}

+

+/** @} */

+

+/*===========================================================================*/

+/* Port-specific settings (override port settings defaulted in chcore.h).    */

+/*===========================================================================*/

+

+#endif  /* _CHCONF_H_ */

+

+/** @} */

diff --git a/testhal/LPC43xx/DMA_MEM/halconf.h b/testhal/STM32F4xx/I2S/halconf.h
index 012ec4aa1..fb3e8905a 100644
--- a/testhal/LPC43xx/DMA_MEM/halconf.h
+++ b/testhal/STM32F4xx/I2S/halconf.h
@@ -1,312 +1,312 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#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__)
-#define HAL_USE_PAL                 TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                 FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                 FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                 FALSE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                 FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                 FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI             FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                 FALSE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL              TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                 FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE          TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY           FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS              TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY              100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT             FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING            TRUE
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE      38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 64 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE         16
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                TRUE
-#endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION    TRUE
-#endif
-
-#endif /* _HALCONF_H_ */
-
-/** @} */
+/*

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    templates/halconf.h

+ * @brief   HAL configuration header.

+ * @details HAL configuration file, this file allows to enable or disable the

+ *          various device drivers from your application. You may also use

+ *          this file in order to override the device drivers default settings.

+ *

+ * @addtogroup HAL_CONF

+ * @{

+ */

+

+#ifndef _HALCONF_H_

+#define _HALCONF_H_

+

+#include "mcuconf.h"

+

+/**

+ * @brief   Enables the PAL subsystem.

+ */

+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

+#define HAL_USE_PAL                 TRUE

+#endif

+

+/**

+ * @brief   Enables the ADC subsystem.

+ */

+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

+#define HAL_USE_ADC                 FALSE

+#endif

+

+/**

+ * @brief   Enables the CAN subsystem.

+ */

+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

+#define HAL_USE_CAN                 FALSE

+#endif

+

+/**

+ * @brief   Enables the EXT subsystem.

+ */

+#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

+#define HAL_USE_EXT                 FALSE

+#endif

+

+/**

+ * @brief   Enables the GPT subsystem.

+ */

+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

+#define HAL_USE_GPT                 FALSE

+#endif

+

+/**

+ * @brief   Enables the I2C subsystem.

+ */

+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

+#define HAL_USE_I2C                 FALSE

+#endif

+

+/**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 TRUE

+#endif

+

+/**

+ * @brief   Enables the ICU subsystem.

+ */

+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

+#define HAL_USE_ICU                 FALSE

+#endif

+

+/**

+ * @brief   Enables the MAC subsystem.

+ */

+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

+#define HAL_USE_MAC                 FALSE

+#endif

+

+/**

+ * @brief   Enables the MMC_SPI subsystem.

+ */

+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

+#define HAL_USE_MMC_SPI             FALSE

+#endif

+

+/**

+ * @brief   Enables the PWM subsystem.

+ */

+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

+#define HAL_USE_PWM                 FALSE

+#endif

+

+/**

+ * @brief   Enables the RTC subsystem.

+ */

+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

+#define HAL_USE_RTC                 FALSE

+#endif

+

+/**

+ * @brief   Enables the SDC subsystem.

+ */

+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

+#define HAL_USE_SDC                 FALSE

+#endif

+

+/**

+ * @brief   Enables the SERIAL subsystem.

+ */

+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

+#define HAL_USE_SERIAL              FALSE

+#endif

+

+/**

+ * @brief   Enables the SERIAL over USB subsystem.

+ */

+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

+#define HAL_USE_SERIAL_USB          FALSE

+#endif

+

+/**

+ * @brief   Enables the SPI subsystem.

+ */

+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

+#define HAL_USE_SPI                 FALSE

+#endif

+

+/**

+ * @brief   Enables the UART subsystem.

+ */

+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

+#define HAL_USE_UART                FALSE

+#endif

+

+/**

+ * @brief   Enables the USB subsystem.

+ */

+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

+#define HAL_USE_USB                 FALSE

+#endif

+

+/*===========================================================================*/

+/* ADC driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

+#define ADC_USE_WAIT                TRUE

+#endif

+

+/**

+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

+#define ADC_USE_MUTUAL_EXCLUSION    TRUE

+#endif

+

+/*===========================================================================*/

+/* CAN driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Sleep mode related APIs inclusion switch.

+ */

+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

+#define CAN_USE_SLEEP_MODE          TRUE

+#endif

+

+/*===========================================================================*/

+/* I2C driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables the mutual exclusion APIs on the I2C bus.

+ */

+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

+#define I2C_USE_MUTUAL_EXCLUSION    TRUE

+#endif

+

+/*===========================================================================*/

+/* MAC driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables an event sources for incoming packets.

+ */

+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

+#define MAC_USE_ZERO_COPY           FALSE

+#endif

+

+/**

+ * @brief   Enables an event sources for incoming packets.

+ */

+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

+#define MAC_USE_EVENTS              TRUE

+#endif

+

+/*===========================================================================*/

+/* MMC_SPI driver related settings.                                          */

+/*===========================================================================*/

+

+/**

+ * @brief   Delays insertions.

+ * @details If enabled this options inserts delays into the MMC waiting

+ *          routines releasing some extra CPU time for the threads with

+ *          lower priority, this may slow down the driver a bit however.

+ *          This option is recommended also if the SPI driver does not

+ *          use a DMA channel and heavily loads the CPU.

+ */

+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

+#define MMC_NICE_WAITING            TRUE

+#endif

+

+/*===========================================================================*/

+/* SDC driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Number of initialization attempts before rejecting the card.

+ * @note    Attempts are performed at 10mS intervals.

+ */

+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

+#define SDC_INIT_RETRY              100

+#endif

+

+/**

+ * @brief   Include support for MMC cards.

+ * @note    MMC support is not yet implemented so this option must be kept

+ *          at @p FALSE.

+ */

+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

+#define SDC_MMC_SUPPORT             FALSE

+#endif

+

+/**

+ * @brief   Delays insertions.

+ * @details If enabled this options inserts delays into the MMC waiting

+ *          routines releasing some extra CPU time for the threads with

+ *          lower priority, this may slow down the driver a bit however.

+ */

+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

+#define SDC_NICE_WAITING            TRUE

+#endif

+

+/*===========================================================================*/

+/* SERIAL driver related settings.                                           */

+/*===========================================================================*/

+

+/**

+ * @brief   Default bit rate.

+ * @details Configuration parameter, this is the baud rate selected for the

+ *          default configuration.

+ */

+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

+#define SERIAL_DEFAULT_BITRATE      38400

+#endif

+

+/**

+ * @brief   Serial buffers size.

+ * @details Configuration parameter, you can change the depth of the queue

+ *          buffers depending on the requirements of your application.

+ * @note    The default is 64 bytes for both the transmission and receive

+ *          buffers.

+ */

+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

+#define SERIAL_BUFFERS_SIZE         16

+#endif

+

+/*===========================================================================*/

+/* SPI driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

+#define SPI_USE_WAIT                TRUE

+#endif

+

+/**

+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

+#define SPI_USE_MUTUAL_EXCLUSION    TRUE

+#endif

+

+#endif /* _HALCONF_H_ */

+

+/** @} */

diff --git a/testhal/STM32F4xx/BKPSRAM/main.c b/testhal/STM32F4xx/I2S/main.c
index 801d7e444..b96f22fb4 100644
--- a/testhal/STM32F4xx/BKPSRAM/main.c
+++ b/testhal/STM32F4xx/I2S/main.c
@@ -17,36 +17,32 @@
 #include "ch.h"

 #include "hal.h"

 

-uint32_t *bkpsram = (uint32_t *)BKPSRAM_BASE;

+#define I2S_BUF_SIZE            256

 

-/*

- *

- */

-static void write_watermark(void){

-  size_t i = 0;

-  for (i=0; i<10; i++)

-    bkpsram[i] = i;

+static uint16_t i2s_rx_buf[I2S_BUF_SIZE];

 

-  /* signalize about sram erase */

-  palClearPad(GPIOB, GPIOB_LED_R);

-}

+static void i2scallback(I2SDriver *i2sp, size_t offset, size_t n);

 

-/*

- *

- */

-static bool check_watermark(void){

-  size_t i = 0;

-  for (i=0; i<10; i++){

-    if (bkpsram[i] != i)

-      return false;

-  }

-  return true;

+static const I2SConfig i2scfg = {

+  NULL,

+  i2s_rx_buf,

+  I2S_BUF_SIZE,

+  i2scallback,

+  0,

+  16

+};

+

+static void i2scallback(I2SDriver *i2sp, size_t offset, size_t n) {

+

+  (void)i2sp;

+  (void)offset;

+  (void)n;

 }

 

-/**

- * Main function.

+/*

+ * Application entry point.

  */

-int main(void){

+int main(void) {

 

   /*

    * System initializations.

@@ -58,18 +54,26 @@ int main(void){
   halInit();

   chSysInit();

 

-  /* Goal of this testhal */

-  if (!check_watermark()){

-    write_watermark();

-  }

+  /*

+   * Starting and configuring the I2S driver 2.

+   */

+  i2sStart(&I2SD2, &i2scfg);

+  palSetPadMode(GPIOB, 10, PAL_MODE_ALTERNATE(5));

+  palSetPadMode(GPIOC, 3, PAL_MODE_ALTERNATE(5));

 

-  /* Normal main thread loop. */

-  while (TRUE){

-    chThdSleepMilliseconds(200);

-    palTogglePad(GPIOB, GPIOB_LED_B);

-  }

+  /*

+   * Starting continuous I2S transfer.

+   */

+  i2sStartExchange(&I2SD2);

 

+  /*

+   * Normal main() thread activity, if the button is pressed then the I2s

+   * transfer is stopped.

+   */

+  while (TRUE) {

+    if (palReadPad(GPIOA, GPIOA_BUTTON))

+      i2sStopExchange(&I2SD2);

+    chThdSleepMilliseconds(500);

+  }

   return 0;

 }

-

-

diff --git a/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h b/testhal/STM32F4xx/I2S/mcuconf.h
index 2a16dc0f0..8b49e5ebd 100644
--- a/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h
+++ b/testhal/STM32F4xx/I2S/mcuconf.h
@@ -54,7 +54,7 @@
 #define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1

 #define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK

 #define STM32_MCO2PRE                       STM32_MCO2PRE_DIV5

-#define STM32_I2SSRC                        STM32_I2SSRC_CKIN

+#define STM32_I2SSRC                        STM32_I2SSRC_PLLI2S

 #define STM32_PLLI2SN_VALUE                 192

 #define STM32_PLLI2SR_VALUE                 5

 #define STM32_PVD_ENABLE                    FALSE

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,22 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

+

+/*

+ * I2S driver system settings.

+ */

+#define STM32_I2S_USE_SPI2                  TRUE

+#define STM32_I2S_USE_SPI3                  FALSE

+#define STM32_I2S_SPI2_IRQ_PRIORITY         10

+#define STM32_I2S_SPI3_IRQ_PRIORITY         10

+#define STM32_I2S_SPI2_DMA_PRIORITY         1

+#define STM32_I2S_SPI3_DMA_PRIORITY         1

+#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

+#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

+#define STM32_I2S_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

+#define STM32_I2S_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)

+#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,10 +218,21 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

@@ -237,7 +262,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +303,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F1xx/GPT/readme.txt b/testhal/STM32F4xx/I2S/readme.txt
index 2355ef173..515e02dd9 100644
--- a/testhal/STM32F1xx/GPT/readme.txt
+++ b/testhal/STM32F4xx/I2S/readme.txt
@@ -1,14 +1,18 @@
 *****************************************************************************

-** ChibiOS/RT HAL - GPT driver demo for STM32.                             **

+** ChibiOS/RT HAL - I2S driver demo for STM32F4xx.                         **

 *****************************************************************************

 

 ** TARGET **

 

-The demo will on an Olimex STM32-P103 board.

+The demo runs on an ST STM32F4-Discovery board.

 

 ** The Demo **

 

-The application demonstrates the use of the STM32 GPT driver.

+The application demonstrates the use of the STM32F4xx I2S driver.

+

+** Board Setup **

+

+None.

 

 ** Build Procedure **

 

diff --git a/testhal/STM32F4xx/IRQ_STORM/.cproject b/testhal/STM32F4xx/IRQ_STORM/.cproject
index 1e9c4518b..bf4708179 100644
--- a/testhal/STM32F4xx/IRQ_STORM/.cproject
+++ b/testhal/STM32F4xx/IRQ_STORM/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/IRQ_STORM/.project b/testhal/STM32F4xx/IRQ_STORM/.project
index 6f3b0385f..122d48d9d 100644
--- a/testhal/STM32F4xx/IRQ_STORM/.project
+++ b/testhal/STM32F4xx/IRQ_STORM/.project
@@ -27,7 +27,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/testhal/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32F4xx/IRQ_STORM/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F4xx/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/IRQ_STORM/chconf.h b/testhal/STM32F4xx/IRQ_STORM/chconf.h
index 38242d75d..7ff9a1440 100644
--- a/testhal/STM32F4xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

@@ -526,8 +493,6 @@
 /* Port-specific settings (override port settings defaulted in chcore.h).    */

 /*===========================================================================*/

 

-#define CORTEX_USE_FPU                FALSE

-

 #endif  /* _CHCONF_H_ */

 

 /** @} */

diff --git a/testhal/STM32F4xx/IRQ_STORM/halconf.h b/testhal/STM32F4xx/IRQ_STORM/halconf.h
index 117a5979b..40207d045 100644
--- a/testhal/STM32F4xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/IRQ_STORM/main.c b/testhal/STM32F4xx/IRQ_STORM/main.c
index ddda52359..861a6e033 100644
--- a/testhal/STM32F4xx/IRQ_STORM/main.c
+++ b/testhal/STM32F4xx/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -117,15 +117,15 @@ static msg_t WorkerThread(void *arg) {
 /*

  * GPT2 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -135,19 +135,20 @@ static void gpt3cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

  * GPT2 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt4cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -157,6 +158,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -217,14 +219,14 @@ int main(void) {
   sdStart(&SD2, NULL);          /* Default is 38400-8-N-1.*/

   palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(7));

   palSetPadMode(GPIOA, 3, PAL_MODE_ALTERNATE(7));

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD4, &gpt4cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -239,19 +241,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -286,11 +288,13 @@ int main(void) {
     println("");

     saturated = FALSE;

     threshold = 0;

-    for (interval = 2000; interval >= 10; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+    for (interval = 2000;

+        interval >= 2;

+        interval -= (interval + 9) / 10) {

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -311,7 +315,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

diff --git a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
index f5ba86859..9fca1da26 100644
--- a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
@@ -109,9 +109,9 @@
  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

-#define STM32_GPT_USE_TIM4                  FALSE

+#define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  FALSE

 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

@@ -121,9 +121,9 @@
 #define STM32_GPT_USE_TIM12                 FALSE

 #define STM32_GPT_USE_TIM14                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         6

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         10

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM4_IRQ_PRIORITY         6

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/.cproject b/testhal/STM32F4xx/IRQ_STORM_FPU/.cproject
index 22b5f4d43..304afdf99 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/.cproject
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/.project b/testhal/STM32F4xx/IRQ_STORM_FPU/.project
index 46cb19671..d2e79b473 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/.project
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/.project
@@ -27,7 +27,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/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
index 8391b78dc..43b51f622 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = yes

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = hard

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        extfunc.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/chconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/chconf.h
index f943ea80c..7ff9a1440 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/chconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h
index d91a792b4..40207d045 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/halconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/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__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
index d1c5c7bb1..7ec769a9c 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
@@ -39,12 +39,12 @@ float ff2(float par1, float par2, float par3, float par4);
 /* Test related code.                                                        */

 /*===========================================================================*/

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Test worker thread.

  */

-static WORKING_AREA(waWorkerThread, 128);

+static THD_WORKING_AREA(waWorkerThread, 128);

 static msg_t WorkerThread(void *arg) {

 

   (void)arg;

@@ -59,14 +59,14 @@ static msg_t WorkerThread(void *arg) {
     f4 = ff1(6.0f);

     f5 = ff2(f5, f4, f5, f4);

     if (f5 != 324.0f)

-      chSysHalt();

+      chSysHalt("float corrupion #1");

   }

 }

 

 /*

  * Test periodic thread.

  */

-static WORKING_AREA(waPeriodicThread, 128);

+static THD_WORKING_AREA(waPeriodicThread, 128);

 static msg_t PeriodicThread(void *arg) {

 

   (void)arg;

@@ -81,7 +81,7 @@ static msg_t PeriodicThread(void *arg) {
     f4 = ff1(7.0f);

     f5 = ff2(f5, f4, f5, f4);

     if (f5 != 484.0f)

-      chSysHalt();

+      chSysHalt("float corrupion #2");

     chThdSleepSeconds(1);

   }

 }

@@ -89,7 +89,7 @@ static msg_t PeriodicThread(void *arg) {
 /*

  * GPT2 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

   float f1, f2, f3, f4, f5;

 

   (void)gptp;

@@ -101,7 +101,7 @@ static void gpt2cb(GPTDriver *gptp) {
   f4 = ff1(5.0f);

   f5 = ff2(f5, f4, f5, f4);

   if (f5 != 196.0f)

-    chSysHalt();

+    chSysHalt("float corrupion #3");

 }

 

 /*

@@ -119,15 +119,16 @@ static void gpt3cb(GPTDriver *gptp) {
   f4 = ff1(4.0f);

   f5 = ff2(f5, f4, f5, f4);

   if (f5 != 100.0f)

-    chSysHalt();

+    chSysHalt("float corrupion #4");

 }

 

 /*

  * GPT2 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt4cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -137,6 +138,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -197,7 +199,7 @@ int main(void) {
   sdStart(&SD2, NULL);          /* Default is 38400-8-N-1.*/

   palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(7));

   palSetPadMode(GPIOA, 3, PAL_MODE_ALTERNATE(7));

-  gptStart(&GPTD2, &gpt2cfg);

+  gptStart(&GPTD4, &gpt4cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

@@ -218,19 +220,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -260,10 +262,10 @@ int main(void) {
     saturated = FALSE;

     threshold = 0;

     for (interval = 2000; interval >= 10; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -284,7 +286,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
index f5ba86859..9fca1da26 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
@@ -109,9 +109,9 @@
  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

-#define STM32_GPT_USE_TIM4                  FALSE

+#define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  FALSE

 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

@@ -121,9 +121,9 @@
 #define STM32_GPT_USE_TIM12                 FALSE

 #define STM32_GPT_USE_TIM14                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         6

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         10

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM4_IRQ_PRIORITY         6

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/PWM-ICU/.cproject b/testhal/STM32F4xx/PWM-ICU/.cproject
index 940a1c9d5..681cedec5 100644
--- a/testhal/STM32F4xx/PWM-ICU/.cproject
+++ b/testhal/STM32F4xx/PWM-ICU/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/PWM-ICU/.project b/testhal/STM32F4xx/PWM-ICU/.project
index ebfbb62af..c11e50bc5 100644
--- a/testhal/STM32F4xx/PWM-ICU/.project
+++ b/testhal/STM32F4xx/PWM-ICU/.project
@@ -27,7 +27,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/testhal/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32F4xx/PWM-ICU/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/PWM-ICU/Makefile
+++ b/testhal/STM32F4xx/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/PWM-ICU/chconf.h b/testhal/STM32F4xx/PWM-ICU/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/PWM-ICU/chconf.h
+++ b/testhal/STM32F4xx/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/PWM-ICU/halconf.h b/testhal/STM32F4xx/PWM-ICU/halconf.h
index 2f74c82c8..c1a492c2d 100644
--- a/testhal/STM32F4xx/PWM-ICU/halconf.h
+++ b/testhal/STM32F4xx/PWM-ICU/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/PWM-ICU/main.c b/testhal/STM32F4xx/PWM-ICU/main.c
index 55e9736d2..a964d221e 100644
--- a/testhal/STM32F4xx/PWM-ICU/main.c
+++ b/testhal/STM32F4xx/PWM-ICU/main.c
@@ -84,12 +84,12 @@ int main(void) {
 

   /*

    * Initializes the PWM driver 2 and ICU driver 3.

-   * GPIOA15 is the PWM output.

+   * GPIOA8 is the PWM output.

    * GPIOC6 is the ICU input.

    * The two pins have to be externally connected together.

    */

-  pwmStart(&PWMD2, &pwmcfg);

-  palSetPadMode(GPIOA, 15, PAL_MODE_ALTERNATE(1));

+  pwmStart(&PWMD1, &pwmcfg);

+  palSetPadMode(GPIOA, 8, PAL_MODE_ALTERNATE(1));

   icuStart(&ICUD3, &icucfg);

   palSetPadMode(GPIOC, 6, PAL_MODE_ALTERNATE(2));

   icuEnable(&ICUD3);

@@ -98,33 +98,33 @@ int main(void) {
   /*

    * Starts the PWM channel 0 using 75% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 7500));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 7500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 50% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 5000));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 5000));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes the PWM channel 0 to 25% duty cycle.

    */

-  pwmEnableChannel(&PWMD2, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD2, 2500));

+  pwmEnableChannel(&PWMD1, 0, PWM_PERCENTAGE_TO_WIDTH(&PWMD1, 2500));

   chThdSleepMilliseconds(5000);

 

   /*

    * Changes PWM period to half second the duty cycle becomes 50%

    * implicitly.

    */

-  pwmChangePeriod(&PWMD2, 5000);

+  pwmChangePeriod(&PWMD1, 5000);

   chThdSleepMilliseconds(5000);

 

   /*

    * Disables channel 0 and stops the drivers.

    */

-  pwmDisableChannel(&PWMD2, 0);

-  pwmStop(&PWMD2);

+  pwmDisableChannel(&PWMD1, 0);

+  pwmStop(&PWMD1);

   icuDisable(&ICUD3);

   icuStop(&ICUD3);

   palClearPad(GPIOD, GPIOD_LED4);

diff --git a/testhal/STM32F4xx/PWM-ICU/mcuconf.h b/testhal/STM32F4xx/PWM-ICU/mcuconf.h
index a64322f46..0a70a1cd1 100644
--- a/testhal/STM32F4xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F4xx/PWM-ICU/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -188,8 +187,8 @@
  * PWM driver system settings.

  */

 #define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

-#define STM32_PWM_USE_TIM2                  TRUE

+#define STM32_PWM_USE_TIM1                  TRUE

+#define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/PWM-ICU/readme.txt b/testhal/STM32F4xx/PWM-ICU/readme.txt
index bd908948f..a2b9d67a5 100644
--- a/testhal/STM32F4xx/PWM-ICU/readme.txt
+++ b/testhal/STM32F4xx/PWM-ICU/readme.txt
@@ -12,7 +12,7 @@ The application demonstrates the use of the STM32F4xx PWM-ICU drivers.
 

 ** Board Setup **

 

-- Connect PA15 and PC6 together.

+- Connect PA8 and PC6 together.

 

 ** Build Procedure **

 

diff --git a/testhal/STM32F4xx/RTC/.cproject b/testhal/STM32F4xx/RTC/.cproject
index 685ffe5f1..698b866bf 100644
--- a/testhal/STM32F4xx/RTC/.cproject
+++ b/testhal/STM32F4xx/RTC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/RTC/Makefile b/testhal/STM32F4xx/RTC/Makefile
index e383fef85..1eb858fbd 100644
--- a/testhal/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32F4xx/RTC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        $(CHIBIOS)/os/various/evtimer.c \

@@ -119,7 +136,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -144,6 +161,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -164,29 +182,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -209,18 +204,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/RTC/chconf.h b/testhal/STM32F4xx/RTC/chconf.h
index 0a00640e2..b6ca0aa69 100644
--- a/testhal/STM32F4xx/RTC/chconf.h
+++ b/testhal/STM32F4xx/RTC/chconf.h
@@ -28,21 +28,44 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

-#define PORT_IDLE_THREAD_STACK_SIZE     32

-#define CORTEX_USE_FPU                  FALSE

-

 /*===========================================================================*/

-/* Kernel parameters.                                                        */

+/**

+ * @name System timers settings

+ * @{

+ */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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                 0//20

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,31 +90,25 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

+

+/** @} */

 

 /*===========================================================================*/

-/* Performance options.                                                      */

+/**

+ * @name Performance options

+ * @{

+ */

 /*===========================================================================*/

 

 /**

@@ -103,23 +119,33 @@
  * @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               FALSE

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

+

+/** @} */

 

 /*===========================================================================*/

-/* Subsystem options.                                                        */

+/**

+ * @name Subsystem options

+ * @{

+ */

 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -128,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -138,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -182,11 +199,9 @@
  *          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                 FALSE

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -194,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -206,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -216,11 +227,9 @@
  *          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           FALSE

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -229,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -251,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -263,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -274,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -284,27 +284,11 @@
  *          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                     FALSE

-#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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -313,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -323,16 +305,27 @@
  *          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                  FALSE

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

+

+/** @} */

 

 /*===========================================================================*/

-/* Debug options.                                                            */

+/**

+ * @name Debug options

+ * @{

+ */

 /*===========================================================================*/

+

+/**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

 /**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

@@ -340,9 +333,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -351,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -363,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -374,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -388,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -400,35 +383,34 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

+

+/** @} */

 

 /*===========================================================================*/

-/* Kernel hooks.                                                             */

+/**

+ * @name Kernel hooks

+ * @{

+ */

 /*===========================================================================*/

 

 /**

  * @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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -437,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -451,53 +431,63 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

+

+/** @} */

 

 /*===========================================================================*/

 /* Port-specific settings (override port settings defaulted in chcore.h).    */

diff --git a/testhal/STM32F4xx/RTC/halconf.h b/testhal/STM32F4xx/RTC/halconf.h
index f0040635d..76a560cdd 100644
--- a/testhal/STM32F4xx/RTC/halconf.h
+++ b/testhal/STM32F4xx/RTC/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/RTC/main.c b/testhal/STM32F4xx/RTC/main.c
index ce5fdcae1..6b25d371a 100644
--- a/testhal/STM32F4xx/RTC/main.c
+++ b/testhal/STM32F4xx/RTC/main.c
@@ -47,6 +47,22 @@ static RTCWakeup wakeupspec;
 static RTCAlarm alarmspec;

 static time_t unix_time;

 

+/* libc stub */

+int _getpid(void) {return 1;}

+/* libc stub */

+void _exit(int i) {(void)i;}

+/* libc stub */

+#include <errno.h>

+#undef errno

+extern int errno;

+int _kill(int pid, int sig) {

+  (void)pid;

+  (void)sig;

+  errno = EINVAL;

+  return -1;

+}

+

+

 /* sleep indicator thread */

 static WORKING_AREA(blinkWA, 128);

 static msg_t blink_thd(void *arg){

diff --git a/testhal/STM32F4xx/RTC/mcuconf.h b/testhal/STM32F4xx/RTC/mcuconf.h
index ba6406752..14aca7564 100644
--- a/testhal/STM32F4xx/RTC/mcuconf.h
+++ b/testhal/STM32F4xx/RTC/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/RTC_FATTIME/Makefile b/testhal/STM32F4xx/RTC_FATTIME/Makefile
deleted file mode 100644
index ffd36e3d2..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-##############################################################################

-# Build global options

-# NOTE: Can be overridden externally.

-#

-

-# Compiler options here.

-ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 #-mhard-float -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-endif

-

-# C specific options here (added to USE_OPT).

-ifeq ($(USE_COPT),)

-  USE_COPT = 

-endif

-

-# C++ specific options here (added to USE_OPT).

-ifeq ($(USE_CPPOPT),)

-  USE_CPPOPT = -fno-rtti

-endif

-

-# Enable this if you want the linker to remove unused code and data

-ifeq ($(USE_LINK_GC),)

-  USE_LINK_GC = yes

-endif

-

-# If enabled, this option allows to compile the application in THUMB mode.

-ifeq ($(USE_THUMB),)

-  USE_THUMB = yes

-endif

-

-# Enable this if you want to see the full log while compiling.

-ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = no

-endif

-

-#

-# Build global options

-##############################################################################

-

-##############################################################################

-# Architecture or project specific options

-#

-

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

-#

-# Architecture or project specific options

-##############################################################################

-

-##############################################################################

-# Project, sources and paths

-#

-

-# Define project name here

-PROJECT = ch

-

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# Imported source files and paths

-CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/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/various/fatfs_bindings/fatfs.mk

-#include $(CHIBIOS)/test/test.mk

-

-# Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-

-# C sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CSRC = $(PORTSRC) \

-       $(KERNSRC) \

-       $(TESTSRC) \

-       $(HALSRC) \

-       $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(FATFSSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       $(CHIBIOS)/os/various/chrtclib.c \

-       main.c

-

-# C++ sources that can be compiled in ARM or THUMB mode depending on the global

-# setting.

-CPPSRC =

-

-# C sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACSRC =

-

-# C++ sources to be compiled in ARM mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-ACPPSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCSRC =

-

-# C sources to be compiled in THUMB mode regardless of the global setting.

-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

-#       option that results in lower performance and larger code size.

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = $(PORTASM)

-

-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various  $(FATFSINC)

-

-#

-# Project, sources and paths

-##############################################################################

-

-##############################################################################

-# Compiler settings

-#

-

-MCU  = cortex-m4

-

-#TRGT = arm-elf-

-TRGT = arm-none-eabi-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -DTHUMB

-

-# Define C warning options here

-CWARN = -Wall -Wextra -Wstrict-prototypes

-

-# Define C++ warning options here

-CPPWARN = -Wall -Wextra

-

-#

-# Compiler settings

-##############################################################################

-

-##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

-# Start of user section

-#

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# List all user directories here

-UINCDIR =

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-#

-# End of user defines

-##############################################################################

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F4xx/RTC_FATTIME/chconf.h b/testhal/STM32F4xx/RTC_FATTIME/chconf.h
deleted file mode 100644
index 868377751..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/chconf.h
+++ /dev/null
@@ -1,534 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-#define PORT_IDLE_THREAD_STACK_SIZE     32

-#define CORTEX_USE_FPU                  FALSE

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

-

-/**

- * @brief   Debug option, threads profiling.

- * @details If enabled then a field is added to the @p Thread 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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F4xx/RTC_FATTIME/ffconf.h b/testhal/STM32F4xx/RTC_FATTIME/ffconf.h
deleted file mode 100644
index a4816e845..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/ffconf.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* CHIBIOS FIX */

-#include "ch.h"

-

-/*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file  R0.09  (C)ChaN, 2011

-/----------------------------------------------------------------------------/

-/

-/ CAUTION! Do not forget to make clean the project after any changes to

-/ the configuration options.

-/

-/----------------------------------------------------------------------------*/

-#ifndef _FFCONF

-#define _FFCONF 6502	/* Revision ID */

-

-

-/*---------------------------------------------------------------------------/

-/ Functions and Buffer Configurations

-/----------------------------------------------------------------------------*/

-

-#define	_FS_TINY		0	/* 0:Normal or 1:Tiny */

-/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system

-/  object instead of the sector buffer in the individual file object for file

-/  data transfer. This reduces memory consumption 512 bytes each file object. */

-

-

-#define _FS_READONLY	0	/* 0:Read/Write or 1:Read only */

-/* Setting _FS_READONLY to 1 defines read only configuration. This removes

-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,

-/  f_truncate and useless f_getfree. */

-

-

-#define _FS_MINIMIZE	0	/* 0 to 3 */

-/* The _FS_MINIMIZE option defines minimization level to remove some functions.

-/

-/   0: Full function.

-/   1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename

-/      are removed.

-/   2: f_opendir and f_readdir are removed in addition to 1.

-/   3: f_lseek is removed in addition to 2. */

-

-

-#define	_USE_STRFUNC	0	/* 0:Disable or 1-2:Enable */

-/* To enable string functions, set _USE_STRFUNC to 1 or 2. */

-

-

-#define	_USE_MKFS		1	/* 0:Disable or 1:Enable */

-/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */

-

-

-#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */

-/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */

-

-

-#define	_USE_FASTSEEK	0	/* 0:Disable or 1:Enable */

-/* To enable fast seek feature, set _USE_FASTSEEK to 1. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Locale and Namespace Configurations

-/----------------------------------------------------------------------------*/

-

-#define _CODE_PAGE	1251

-/* The _CODE_PAGE specifies the OEM code page to be used on the target system.

-/  Incorrect setting of the code page can cause a file open failure.

-/

-/   932  - Japanese Shift-JIS (DBCS, OEM, Windows)

-/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)

-/   949  - Korean (DBCS, OEM, Windows)

-/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)

-/   1250 - Central Europe (Windows)

-/   1251 - Cyrillic (Windows)

-/   1252 - Latin 1 (Windows)

-/   1253 - Greek (Windows)

-/   1254 - Turkish (Windows)

-/   1255 - Hebrew (Windows)

-/   1256 - Arabic (Windows)

-/   1257 - Baltic (Windows)

-/   1258 - Vietnam (OEM, Windows)

-/   437  - U.S. (OEM)

-/   720  - Arabic (OEM)

-/   737  - Greek (OEM)

-/   775  - Baltic (OEM)

-/   850  - Multilingual Latin 1 (OEM)

-/   858  - Multilingual Latin 1 + Euro (OEM)

-/   852  - Latin 2 (OEM)

-/   855  - Cyrillic (OEM)

-/   866  - Russian (OEM)

-/   857  - Turkish (OEM)

-/   862  - Hebrew (OEM)

-/   874  - Thai (OEM, Windows)

-/	1    - ASCII only (Valid for non LFN cfg.)

-*/

-

-

-#define	_USE_LFN	1		/* 0 to 3 */

-#define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */

-/* The _USE_LFN option switches the LFN support.

-/

-/   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.

-/   1: Enable LFN with static working buffer on the BSS. Always NOT reentrant.

-/   2: Enable LFN with dynamic working buffer on the STACK.

-/   3: Enable LFN with dynamic working buffer on the HEAP.

-/

-/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN,

-/  Unicode handling functions ff_convert() and ff_wtoupper() must be added

-/  to the project. When enable to use heap, memory control functions

-/  ff_memalloc() and ff_memfree() must be added to the project. */

-

-

-#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */

-/* To switch the character code set on FatFs API to Unicode,

-/  enable LFN feature and set _LFN_UNICODE to 1. */

-

-

-#define _FS_RPATH		0	/* 0 to 2 */

-/* The _FS_RPATH option configures relative path feature.

-/

-/   0: Disable relative path feature and remove related functions.

-/   1: Enable relative path. f_chdrive() and f_chdir() are available.

-/   2: f_getcwd() is available in addition to 1.

-/

-/  Note that output of the f_readdir fnction is affected by this option. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Physical Drive Configurations

-/----------------------------------------------------------------------------*/

-

-#define _VOLUMES	1

-/* Number of volumes (logical drives) to be used. */

-

-

-#define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */

-/* Maximum sector size to be handled.

-/  Always set 512 for memory card and hard disk but a larger value may be

-/  required for on-board flash memory, floppy disk and optical disk.

-/  When _MAX_SS is larger than 512, it configures FatFs to variable sector size

-/  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */

-

-

-#define	_MULTI_PARTITION	0	/* 0:Single partition, 1/2:Enable multiple partition */

-/* When set to 0, each volume is bound to the same physical drive number and

-/ it can mount only first primaly partition. When it is set to 1, each volume

-/ is tied to the partitions listed in VolToPart[]. */

-

-

-#define	_USE_ERASE	1	/* 0:Disable or 1:Enable */

-/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command

-/  should be added to the disk_ioctl functio. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ System Configurations

-/----------------------------------------------------------------------------*/

-

-#define _WORD_ACCESS	1	/* 0 or 1 */

-/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS

-/  option defines which access method is used to the word data on the FAT volume.

-/

-/   0: Byte-by-byte access.

-/   1: Word access. Do not choose this unless following condition is met.

-/

-/  When the byte order on the memory is big-endian or address miss-aligned word

-/  access results incorrect behavior, the _WORD_ACCESS must be set to 0.

-/  If it is not the case, the value can also be set to 1 to improve the

-/  performance and code size.

-*/

-

-

-/* A header file that defines sync object types on the O/S, such as

-/  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */

-

-#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */

-#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */

-#define	_SYNC_t			Semaphore * /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */

-

-/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.

-/

-/   0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect.

-/   1: Enable reentrancy. Also user provided synchronization handlers,

-/      ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj

-/      function must be added to the project. */

-

-

-#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */

-/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value

-   defines how many files can be opened simultaneously. */

-

-

-#endif /* _FFCONFIG */

diff --git a/testhal/STM32F4xx/RTC_FATTIME/halconf.h b/testhal/STM32F4xx/RTC_FATTIME/halconf.h
deleted file mode 100644
index f33c18c27..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/halconf.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#include "mcuconf.h"

-

-/**

- * @brief   Enables the PAL subsystem.

- */

-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              TRUE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/**

- * @brief   Write timeout in milliseconds.

- */

-#if !defined(SDC_WRITE_TIMEOUT_MS) || defined(__DOXYGEN__)

-#define SDC_WRITE_TIMEOUT_MS            250

-#endif

-

-/**

- * @brief   Write timeout in milliseconds.

- */

-#if !defined(SDC_READ_TIMEOUT_MS) || defined(__DOXYGEN__)

-#define SDC_READ_TIMEOUT_MS             5

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM32F4xx/RTC_FATTIME/main.c b/testhal/STM32F4xx/RTC_FATTIME/main.c
deleted file mode 100644
index 3c031ade0..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/main.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include <string.h>

-#include <time.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "shell.h"

-#include "chprintf.h"

-#include "chrtclib.h"

-

-#include "ff.h"

-

-/* FS object.*/

-static FATFS SDC_FS;

-

-/* FS mounted and ready.*/

-static bool_t fs_ready = FALSE;

-

-/**

- *

- */

-bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {

-  (void)sdcp;

-  return FALSE;

-}

-

-/**

- *

- */

-bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {

-  (void)sdcp;

-  return !palReadPad(GPIOE, GPIOE_SDIO_DETECT);

-}

-

-/**

- *

- */

-void cmd_sdiotest(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argc;

-  (void)argv;

-  FRESULT err;

-  uint32_t clusters;

-  FATFS *fsp;

-  FIL FileObject;

-  //FILINFO FileInfo;

-  size_t bytes_written;

-  struct tm timp;

-

-#if !HAL_USE_RTC

-  chprintf(chp, "ERROR! Chibios compiled without RTC support.");

-  chprintf(chp, "Enable HAL_USE_RCT in you halconf.h");

-  chThdSleepMilliseconds(100);

-  return;

-#endif

-

-  chprintf(chp, "Trying to connect SDIO... ");

-  chThdSleepMilliseconds(100);

-

-  if (!sdcConnect(&SDCD1)) {

-    chprintf(chp, "OK\r\n");

-    chprintf(chp, "Register working area for filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_mount(0, &SDC_FS);

-    if (err != FR_OK){

-      chSysHalt();

-    }

-    else{

-      fs_ready = TRUE;

-      chprintf(chp, "OK\r\n");

-    }

-

-    chprintf(chp, "Mounting filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_getfree("/", &clusters, &fsp);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-    chprintf(chp,

-             "FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",

-             clusters, (uint32_t)SDC_FS.csize,

-             clusters * (uint32_t)SDC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);

-

-    rtcGetTimeTm(&RTCD1, &timp);

-    chprintf(chp, "Current RTC time is: ");

-    chprintf(chp, "%u-%u-%u %u:%u:%u\r\n",

-      timp.tm_year+1900, timp.tm_mon+1, timp.tm_mday, timp.tm_hour, timp.tm_min,

-      timp.tm_sec);

-

-    chprintf(chp, "Creating empty file 'tmstmp.tst'... ");

-    chThdSleepMilliseconds(100);

-    err = f_open(&FileObject, "0:tmstmp.tst", FA_WRITE | FA_OPEN_ALWAYS);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Write some data in it... ");

-    chThdSleepMilliseconds(100);

-    err = f_write(&FileObject, "tst", sizeof("tst"), (void *)&bytes_written);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Closing file 'tmstmp.tst'... ");

-    chThdSleepMilliseconds(100);

-    err = f_close(&FileObject);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

-

-//    chprintf(chp, "Obtaining file info ... ");

-//    chThdSleepMilliseconds(100);

-//    err = f_stat("0:tmstmp.tst", &FileInfo);

-//    if (err != FR_OK) {

-//      chSysHalt();

-//    }

-//    else{

-//      chprintf(chp, "OK\r\n");

-//      chprintf(chp, "    Timestamp: %u-%u-%u %u:%u:%u\r\n",

-//                         ((FileInfo.fdate >> 9) & 127) + 1980,

-//                         (FileInfo.fdate >> 5) & 15,

-//                         FileInfo.fdate & 31,

-//                         (FileInfo.ftime >> 11) & 31,

-//                         (FileInfo.ftime >> 5) & 63,

-//                         (FileInfo.ftime & 31) * 2);

-//    }

-

-    chprintf(chp, "Umounting filesystem... ");

-    f_mount(0, NULL);

-    chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Disconnecting from SDIO...");

-    chThdSleepMilliseconds(100);

-    if (sdcDisconnect(&SDCD1))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-    chprintf(chp, "------------------------------------------------------\r\n");

-    chprintf(chp, "Now you can remove memory card and check timestamp on PC.\r\n");

-    chThdSleepMilliseconds(100);

-  }

-  else{

-    chSysHalt();

-  }

-}

-

-/*

- * SDIO configuration.

- */

-static const SDCConfig sdccfg = {

-  0

-};

-

-/**

- *

- */

-static SerialConfig ser_cfg = {

-    115200,

-    0,

-    0,

-    0,

-};

-static const ShellCommand commands[] = {

-  {"sdiotest", cmd_sdiotest},

-  {NULL, NULL}

-};

-static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream *)&SD2,

-  commands

-};

-

-/*

- * Application entry point.

- */

-int main(void) {

-  halInit();

-  chSysInit();

-

-  /* start debugging serial link */

-  sdStart(&SD2, &ser_cfg);

-  shellInit();

-  static WORKING_AREA(waShell, 4096);

-  shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO);

-

-  /*

-   * Initializes the SDIO drivers.

-   */

-  sdcStart(&SDCD1, &sdccfg);

-

-  /*

-   * Normal main() thread activity.

-   * Blinking signaling about successful passing.

-   */

-  while (TRUE) {

-    palTogglePad(GPIOB, GPIOB_LED_R);

-    chThdSleepMilliseconds(100);

-  }

-}

diff --git a/testhal/STM32F4xx/RTC_FATTIME/readme.txt b/testhal/STM32F4xx/RTC_FATTIME/readme.txt
deleted file mode 100644
index b5036cd2c..000000000
--- a/testhal/STM32F4xx/RTC_FATTIME/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-*****************************************************************************

-** ChibiOS/RT HAL - SDC driver demo for STM32.                             **

-*****************************************************************************

-

-** TARGET **

-

-The demo runs on an Olimex ST_STM3210E_EVAL board.

-

-** The Demo **

-

-The application demonstrates the use of the STM32 RTC driver for timestamping

-files on FAT.

-

-** Build Procedure **

-

-The demo has been tested using the free Codesourcery GCC-based toolchain

-and YAGARTO.

-Just modify the TRGT line in the makefile in order to use different GCC ports.

-

-** Notes **

-

-Some files used by the demo are not part of ChibiOS/RT but are copyright of

-ST Microelectronics and are licensed under a different license.

-Also note that not all the files present in the ST library are distributed

-with ChibiOS/RT, you can find the whole library on the ST web site:

-

-                             http://www.st.com

diff --git a/testhal/STM32F4xx/SDC/.project b/testhal/STM32F4xx/SDC/.project
index 630877d95..665aec725 100644
--- a/testhal/STM32F4xx/SDC/.project
+++ b/testhal/STM32F4xx/SDC/.project
@@ -27,12 +27,7 @@
 		<link>

 			<name>board</name>

 			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32F4_DISCOVERY</locationURI>

-		</link>

-		<link>

-			<name>fatfs</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/ext/fatfs</locationURI>

+			<locationURI>CHIBIOS/os/hal/boards/OLIMEX_STM32_E407</locationURI>

 		</link>

 		<link>

 			<name>os</name>

diff --git a/testhal/STM32F4xx/SDC/Makefile b/testhal/STM32F4xx/SDC/Makefile
index b22e616e5..c7a90fa3b 100644
--- a/testhal/STM32F4xx/SDC/Makefile
+++ b/testhal/STM32F4xx/SDC/Makefile
@@ -5,7 +5,7 @@
 

 # Compiler options here.

 ifeq ($(USE_OPT),)

-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16

+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

 endif

 

 # C specific options here (added to USE_OPT).

@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -63,18 +79,15 @@ endif
 # Define project name here

 PROJECT = ch

 

-# Define linker script file here

-LDSCRIPT= ch.ld

-

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/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/various/fatfs_bindings/fatfs.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

@@ -85,13 +98,11 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(FATFSSRC) \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/syscalls.c \

-       $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/various/chprintf.c \

+       $(CHIBIOS)/os/various/shell.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -122,8 +133,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

-         $(CHIBIOS)/os/various  $(FATFSINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -148,6 +158,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -168,29 +179,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -213,18 +201,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/SDC/chconf.h b/testhal/STM32F4xx/SDC/chconf.h
index 868377751..b6ca0aa69 100644
--- a/testhal/STM32F4xx/SDC/chconf.h
+++ b/testhal/STM32F4xx/SDC/chconf.h
@@ -28,24 +28,44 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

-#define PORT_IDLE_THREAD_STACK_SIZE     32

-#define CORTEX_USE_FPU                  FALSE

-

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -54,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -71,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -111,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -125,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -141,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -151,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -195,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -207,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -219,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -229,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -242,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -264,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -276,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -287,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -297,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -326,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -336,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -353,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -370,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -382,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -393,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -407,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -419,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -447,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -461,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -475,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/SDC/csd.txt b/testhal/STM32F4xx/SDC/csd.txt
deleted file mode 100644
index eefe5274c..000000000
--- a/testhal/STM32F4xx/SDC/csd.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-127 ...                                                                                                                                         ... 0

-

-00000000 00101110 00000000 00110010  -  01011011 01011010 10100011 10100000  -  11111111111111111111111110000000  -  00001010100000000000000010001110 kingmax 2 GB

-00000000 00101110 00000000 00110010  -  01011011 01011010 10000011 10101001  -  11111111111111111111111110000000  -  00010110100000000000000010010000 kingstone 2 GB

-01000000 00001110 00000000 00110010  -  01011011 01011001 00000000 00000000  -  00111011010010110111111110000000  -  00001010010000000100000001000000 samsung sdhc 8 GB

-00000000 00100110 00000000 00110010  -  01011111 01011010 10000011 10101110  -  11111110111110111100111111111111  -  10010010100000000100000011011110 noname 2 GB

-

diff --git a/testhal/STM32F4xx/SDC/ffconf.h b/testhal/STM32F4xx/SDC/ffconf.h
deleted file mode 100644
index 9073f2286..000000000
--- a/testhal/STM32F4xx/SDC/ffconf.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* CHIBIOS FIX */

-#include "ch.h"

-

-/*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file  R0.09  (C)ChaN, 2011

-/----------------------------------------------------------------------------/

-/

-/ CAUTION! Do not forget to make clean the project after any changes to

-/ the configuration options.

-/

-/----------------------------------------------------------------------------*/

-#ifndef _FFCONF

-#define _FFCONF 6502	/* Revision ID */

-

-

-/*---------------------------------------------------------------------------/

-/ Functions and Buffer Configurations

-/----------------------------------------------------------------------------*/

-

-#define	_FS_TINY		0	/* 0:Normal or 1:Tiny */

-/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system

-/  object instead of the sector buffer in the individual file object for file

-/  data transfer. This reduces memory consumption 512 bytes each file object. */

-

-

-#define _FS_READONLY	0	/* 0:Read/Write or 1:Read only */

-/* Setting _FS_READONLY to 1 defines read only configuration. This removes

-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,

-/  f_truncate and useless f_getfree. */

-

-

-#define _FS_MINIMIZE	0	/* 0 to 3 */

-/* The _FS_MINIMIZE option defines minimization level to remove some functions.

-/

-/   0: Full function.

-/   1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename

-/      are removed.

-/   2: f_opendir and f_readdir are removed in addition to 1.

-/   3: f_lseek is removed in addition to 2. */

-

-

-#define	_USE_STRFUNC	0	/* 0:Disable or 1-2:Enable */

-/* To enable string functions, set _USE_STRFUNC to 1 or 2. */

-

-

-#define	_USE_MKFS		1	/* 0:Disable or 1:Enable */

-/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */

-

-

-#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */

-/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */

-

-

-#define	_USE_FASTSEEK	0	/* 0:Disable or 1:Enable */

-/* To enable fast seek feature, set _USE_FASTSEEK to 1. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Locale and Namespace Configurations

-/----------------------------------------------------------------------------*/

-

-#define _CODE_PAGE	1251

-/* The _CODE_PAGE specifies the OEM code page to be used on the target system.

-/  Incorrect setting of the code page can cause a file open failure.

-/

-/   932  - Japanese Shift-JIS (DBCS, OEM, Windows)

-/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)

-/   949  - Korean (DBCS, OEM, Windows)

-/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)

-/   1250 - Central Europe (Windows)

-/   1251 - Cyrillic (Windows)

-/   1252 - Latin 1 (Windows)

-/   1253 - Greek (Windows)

-/   1254 - Turkish (Windows)

-/   1255 - Hebrew (Windows)

-/   1256 - Arabic (Windows)

-/   1257 - Baltic (Windows)

-/   1258 - Vietnam (OEM, Windows)

-/   437  - U.S. (OEM)

-/   720  - Arabic (OEM)

-/   737  - Greek (OEM)

-/   775  - Baltic (OEM)

-/   850  - Multilingual Latin 1 (OEM)

-/   858  - Multilingual Latin 1 + Euro (OEM)

-/   852  - Latin 2 (OEM)

-/   855  - Cyrillic (OEM)

-/   866  - Russian (OEM)

-/   857  - Turkish (OEM)

-/   862  - Hebrew (OEM)

-/   874  - Thai (OEM, Windows)

-/	1    - ASCII only (Valid for non LFN cfg.)

-*/

-

-

-#define	_USE_LFN	3		/* 0 to 3 */

-#define	_MAX_LFN	255		/* Maximum LFN length to handle (12 to 255) */

-/* The _USE_LFN option switches the LFN support.

-/

-/   0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect.

-/   1: Enable LFN with static working buffer on the BSS. Always NOT reentrant.

-/   2: Enable LFN with dynamic working buffer on the STACK.

-/   3: Enable LFN with dynamic working buffer on the HEAP.

-/

-/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN,

-/  Unicode handling functions ff_convert() and ff_wtoupper() must be added

-/  to the project. When enable to use heap, memory control functions

-/  ff_memalloc() and ff_memfree() must be added to the project. */

-

-

-#define	_LFN_UNICODE	0	/* 0:ANSI/OEM or 1:Unicode */

-/* To switch the character code set on FatFs API to Unicode,

-/  enable LFN feature and set _LFN_UNICODE to 1. */

-

-

-#define _FS_RPATH		0	/* 0 to 2 */

-/* The _FS_RPATH option configures relative path feature.

-/

-/   0: Disable relative path feature and remove related functions.

-/   1: Enable relative path. f_chdrive() and f_chdir() are available.

-/   2: f_getcwd() is available in addition to 1.

-/

-/  Note that output of the f_readdir fnction is affected by this option. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ Physical Drive Configurations

-/----------------------------------------------------------------------------*/

-

-#define _VOLUMES	1

-/* Number of volumes (logical drives) to be used. */

-

-

-#define	_MAX_SS		512		/* 512, 1024, 2048 or 4096 */

-/* Maximum sector size to be handled.

-/  Always set 512 for memory card and hard disk but a larger value may be

-/  required for on-board flash memory, floppy disk and optical disk.

-/  When _MAX_SS is larger than 512, it configures FatFs to variable sector size

-/  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */

-

-

-#define	_MULTI_PARTITION	0	/* 0:Single partition, 1/2:Enable multiple partition */

-/* When set to 0, each volume is bound to the same physical drive number and

-/ it can mount only first primaly partition. When it is set to 1, each volume

-/ is tied to the partitions listed in VolToPart[]. */

-

-

-#define	_USE_ERASE	1	/* 0:Disable or 1:Enable */

-/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command

-/  should be added to the disk_ioctl functio. */

-

-

-

-/*---------------------------------------------------------------------------/

-/ System Configurations

-/----------------------------------------------------------------------------*/

-

-#define _WORD_ACCESS	1	/* 0 or 1 */

-/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS

-/  option defines which access method is used to the word data on the FAT volume.

-/

-/   0: Byte-by-byte access.

-/   1: Word access. Do not choose this unless following condition is met.

-/

-/  When the byte order on the memory is big-endian or address miss-aligned word

-/  access results incorrect behavior, the _WORD_ACCESS must be set to 0.

-/  If it is not the case, the value can also be set to 1 to improve the

-/  performance and code size.

-*/

-

-

-/* A header file that defines sync object types on the O/S, such as

-/  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */

-

-#define _FS_REENTRANT	0		/* 0:Disable or 1:Enable */

-#define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */

-#define	_SYNC_t			Semaphore * /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */

-

-/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.

-/

-/   0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect.

-/   1: Enable reentrancy. Also user provided synchronization handlers,

-/      ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj

-/      function must be added to the project. */

-

-

-#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */

-/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value

-   defines how many files can be opened simultaneously. */

-

-

-#endif /* _FFCONFIG */

diff --git a/testhal/STM32F4xx/SDC/halconf.h b/testhal/STM32F4xx/SDC/halconf.h
index 7c79feea0..ec7ffc153 100644
--- a/testhal/STM32F4xx/SDC/halconf.h
+++ b/testhal/STM32F4xx/SDC/halconf.h
@@ -73,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/SDC/main.c b/testhal/STM32F4xx/SDC/main.c
index 721eac66b..264f31133 100644
--- a/testhal/STM32F4xx/SDC/main.c
+++ b/testhal/STM32F4xx/SDC/main.c
@@ -15,341 +15,160 @@
 */

 

 #include <string.h>

+

 #include "ch.h"

 #include "hal.h"

 

-#include "shell.h"

 #include "chprintf.h"

+#include "shell.h"

 

-#include "ff.h"

-

-#define SDC_DATA_DESTRUCTIVE_TEST   FALSE

-

-#define SDC_BURST_SIZE      8 /* how many sectors reads at once */

-static uint8_t outbuf[MMCSD_BLOCK_SIZE * SDC_BURST_SIZE + 1];

-static uint8_t  inbuf[MMCSD_BLOCK_SIZE * SDC_BURST_SIZE + 1];

-

-/* FS object.*/

-static FATFS SDC_FS;

-

-/* FS mounted and ready.*/

-static bool_t fs_ready = FALSE;

+/*

+ * SDIO configuration.

+ */

+static const SDCConfig sdccfg = {

+  0

+};

 

-/**

- * @brief   Parody of UNIX badblocks program.

- *

- * @param[in] start       first block to check

- * @param[in] end         last block to check

- * @param[in] blockatonce number of blocks to check at once

- * @param[in] pattern     check pattern

- *

- * @return              The operation status.

- * @retval SDC_SUCCESS  operation succeeded, the requested blocks have been

- *                      read.

- * @retval SDC_FAILED   operation failed, the state of the buffer is uncertain.

+/*

+ * LED blinker thread, times are in milliseconds.

  */

-bool_t badblocks(uint32_t start, uint32_t end, uint32_t blockatonce, uint8_t pattern){

-  uint32_t position = 0;

-  uint32_t i = 0;

-

-  chDbgCheck(blockatonce <= SDC_BURST_SIZE, "badblocks");

-

-  /* fill control buffer */

-  for (i=0; i < MMCSD_BLOCK_SIZE * blockatonce; i++)

-    outbuf[i] = pattern;

-

-  /* fill SD card with pattern. */

-  position = start;

-  while (position < end){

-    if (sdcWrite(&SDCD1, position, outbuf, blockatonce))

-      goto ERROR;

-    position += blockatonce;

-  }

+static THD_WORKING_AREA(waThread1, 128);

+static msg_t Thread1(void *arg) {

 

-  /* read and compare. */

-  position = start;

-  while (position < end){

-    if (sdcRead(&SDCD1, position, inbuf, blockatonce))

-      goto ERROR;

-    if (memcmp(inbuf, outbuf, blockatonce * MMCSD_BLOCK_SIZE) != 0)

-      goto ERROR;

-    position += blockatonce;

+  (void)arg;

+  chRegSetThreadName("blinker");

+  while (TRUE) {

+    palSetPad(GPIOC, GPIOC_LED);

+    chThdSleepMilliseconds(500);

+    palClearPad(GPIOC, GPIOC_LED);

+    chThdSleepMilliseconds(500);

   }

-  return FALSE;

-

-ERROR:

-  return TRUE;

 }

 

-/**

- *

- */

-void fillbuffer(uint8_t pattern, uint8_t *b){

-  uint32_t i = 0;

-  for (i=0; i < MMCSD_BLOCK_SIZE * SDC_BURST_SIZE; i++)

-    b[i] = pattern;

-}

+/*===========================================================================*/

+/* Command line related.                                                     */

+/*===========================================================================*/

 

-/**

- *

- */

-void fillbuffers(uint8_t pattern){

-  fillbuffer(pattern, inbuf);

-  fillbuffer(pattern, outbuf);

-}

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

 

-/**

- *

- */

-void cmd_sdiotest(BaseSequentialStream *chp, int argc, char *argv[]){

-  (void)argc;

-  (void)argv;

-  uint32_t i = 0;

-

-  chprintf(chp, "Trying to connect SDIO... ");

-  chThdSleepMilliseconds(100);

-

-  if (!sdcConnect(&SDCD1)) {

-

-    chprintf(chp, "OK\r\n");

-    chprintf(chp, "*** Card CSD content is: ");

-    chprintf(chp, "%X %X %X %X \r\n", (&SDCD1)->csd[3], (&SDCD1)->csd[2],

-                                      (&SDCD1)->csd[1], (&SDCD1)->csd[0]);

-

-    chprintf(chp, "Single aligned read...");

-    chThdSleepMilliseconds(100);

-    if (sdcRead(&SDCD1, 0, inbuf, 1))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-    chThdSleepMilliseconds(100);

-

-

-    chprintf(chp, "Single unaligned read...");

-    chThdSleepMilliseconds(100);

-    if (sdcRead(&SDCD1, 0, inbuf + 1, 1))

-      chSysHalt();

-    if (sdcRead(&SDCD1, 0, inbuf + 2, 1))

-      chSysHalt();

-    if (sdcRead(&SDCD1, 0, inbuf + 3, 1))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-    chThdSleepMilliseconds(100);

-

-

-    chprintf(chp, "Multiple aligned reads...");

-    chThdSleepMilliseconds(100);

-    fillbuffers(0x55);

-    /* fill reference buffer from SD card */

-    if (sdcRead(&SDCD1, 0, inbuf, SDC_BURST_SIZE))

-      chSysHalt();

-    for (i=0; i<1000; i++){

-      if (sdcRead(&SDCD1, 0, outbuf, SDC_BURST_SIZE))

-        chSysHalt();

-      if (memcmp(inbuf, outbuf, SDC_BURST_SIZE * MMCSD_BLOCK_SIZE) != 0)

-        chSysHalt();

-    }

-    chprintf(chp, " OK\r\n");

-    chThdSleepMilliseconds(100);

-

-

-    chprintf(chp, "Multiple unaligned reads...");

-    chThdSleepMilliseconds(100);

-    fillbuffers(0x55);

-    /* fill reference buffer from SD card */

-    if (sdcRead(&SDCD1, 0, inbuf + 1, SDC_BURST_SIZE))

-      chSysHalt();

-    for (i=0; i<1000; i++){

-      if (sdcRead(&SDCD1, 0, outbuf + 1, SDC_BURST_SIZE))

-        chSysHalt();

-      if (memcmp(inbuf, outbuf, SDC_BURST_SIZE * MMCSD_BLOCK_SIZE) != 0)

-        chSysHalt();

-    }

-    chprintf(chp, " OK\r\n");

-    chThdSleepMilliseconds(100);

-

-#if SDC_DATA_DESTRUCTIVE_TEST

-

-    chprintf(chp, "Single aligned write...");

-    chThdSleepMilliseconds(100);

-    fillbuffer(0xAA, inbuf);

-    if (sdcWrite(&SDCD1, 0, inbuf, 1))

-      chSysHalt();

-    fillbuffer(0, outbuf);

-    if (sdcRead(&SDCD1, 0, outbuf, 1))

-      chSysHalt();

-    if (memcmp(inbuf, outbuf, MMCSD_BLOCK_SIZE) != 0)

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-

-    chprintf(chp, "Single unaligned write...");

-    chThdSleepMilliseconds(100);

-    fillbuffer(0xFF, inbuf);

-    if (sdcWrite(&SDCD1, 0, inbuf+1, 1))

-      chSysHalt();

-    fillbuffer(0, outbuf);

-    if (sdcRead(&SDCD1, 0, outbuf+1, 1))

-      chSysHalt();

-    if (memcmp(inbuf+1, outbuf+1, MMCSD_BLOCK_SIZE) != 0)

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-

-    chprintf(chp, "Running badblocks at 0x10000 offset...");

-    chThdSleepMilliseconds(100);

-    if(badblocks(0x10000, 0x11000, SDC_BURST_SIZE, 0xAA))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-#endif /* !SDC_DATA_DESTRUCTIVE_TEST */

-

-

-    /**

-     * Now perform some FS tests.

-     */

-

-    FRESULT err;

-    uint32_t clusters;

-    FATFS *fsp;

-    FIL FileObject;

-    uint32_t bytes_written;

-    uint32_t bytes_read;

-    FILINFO filinfo;

-    uint8_t teststring[] = {"This is test file\r\n"};

-

-    chprintf(chp, "Register working area for filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_mount(0, &SDC_FS);

-    if (err != FR_OK){

-      chSysHalt();

-    }

-    else{

-      fs_ready = TRUE;

-      chprintf(chp, "OK\r\n");

-    }

+#define SDC_BURST_SIZE      16

 

+/* Buffer for block read/write operations, note that an extra byte is

+   allocated in order to support unaligned operations.*/

+static uint8_t buf[MMCSD_BLOCK_SIZE * SDC_BURST_SIZE + 1];

 

-#if SDC_DATA_DESTRUCTIVE_TEST

-    chprintf(chp, "Formatting... ");

-    chThdSleepMilliseconds(100);

-    err = f_mkfs (0,0,0);

-    if (err != FR_OK){

-      chSysHalt();

-    }

-    else{

-      chprintf(chp, "OK\r\n");

-    }

-#endif /* SDC_DATA_DESTRUCTIVE_TEST */

-

+void cmd_sdc(BaseSequentialStream *chp, int argc, char *argv[]) {

+  static const char *mode[] = {"SDV11", "SDV20", "MMC", NULL};

+  systime_t start, end;

+  uint32_t n, startblk;

 

-    chprintf(chp, "Mount filesystem... ");

-    chThdSleepMilliseconds(100);

-    err = f_getfree("/", &clusters, &fsp);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-    chprintf(chp,

-             "FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",

-             clusters, (uint32_t)SDC_FS.csize,

-             clusters * (uint32_t)SDC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);

-

-

-    chprintf(chp, "Create file \"chtest.txt\"... ");

-    chThdSleepMilliseconds(100);

-    err = f_open(&FileObject, "0:chtest.txt", FA_WRITE | FA_OPEN_ALWAYS);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    chprintf(chp, "OK\r\n");

-    chprintf(chp, "Write some data in it... ");

-    chThdSleepMilliseconds(100);

-    err = f_write(&FileObject, teststring, sizeof(teststring), (void *)&bytes_written);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

+  if (argc != 1) {

+    chprintf(chp, "Usage: sdiotest read|write|all\r\n");

+    return;

+  }

 

-    chprintf(chp, "Close file \"chtest.txt\"... ");

-    err = f_close(&FileObject);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else

-      chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Check file size \"chtest.txt\"... ");

-    err = f_stat("0:chtest.txt", &filinfo);

-    chThdSleepMilliseconds(100);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else{

-      if (filinfo.fsize == sizeof(teststring))

-        chprintf(chp, "OK\r\n");

-      else

-        chSysHalt();

-    }

+  /* Card presence check.*/

+  if (!blkIsInserted(&SDCD1)) {

+    chprintf(chp, "Card not inserted, aborting.\r\n");

+    return;

+  }

 

-    chprintf(chp, "Check file content \"chtest.txt\"... ");

-    err = f_open(&FileObject, "0:chtest.txt", FA_READ | FA_OPEN_EXISTING);

-    chThdSleepMilliseconds(100);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    uint8_t buf[sizeof(teststring)];

-    err = f_read(&FileObject, buf, sizeof(teststring), (void *)&bytes_read);

-    if (err != FR_OK) {

-      chSysHalt();

-    }

-    else{

-      if (memcmp(teststring, buf, sizeof(teststring)) != 0){

-        chSysHalt();

+  /* Connection to the card.*/

+  chprintf(chp, "Connecting... ");

+  if (sdcConnect(&SDCD1)) {

+    chprintf(chp, "failed\r\n");

+    return;

+  }

+  chprintf(chp, "OK\r\n\r\nCard Info\r\n");

+  chprintf(chp, "CSD      : %08X %8X %08X %08X \r\n",

+           SDCD1.csd[3], SDCD1.csd[2], SDCD1.csd[1], SDCD1.csd[0]);

+  chprintf(chp, "CID      : %08X %8X %08X %08X \r\n",

+           SDCD1.cid[3], SDCD1.cid[2], SDCD1.cid[1], SDCD1.cid[0]);

+  chprintf(chp, "Mode     : %s\r\n", mode[SDCD1.cardmode]);

+  chprintf(chp, "Capacity : %DMB\r\n", SDCD1.capacity / 2048);

+

+  /* The test is performed in the middle of the flash area.*/

+  startblk = (SDCD1.capacity / MMCSD_BLOCK_SIZE) / 2;

+

+  if ((strcmp(argv[0], "read") == 0) ||

+      (strcmp(argv[0], "all") == 0)) {

+

+    /* Single block read performance, aligned.*/

+    chprintf(chp, "Single block aligned read performance:           ");

+    start = chVTGetSystemTime();

+    end = start + MS2ST(1000);

+    n = 0;

+    do {

+      if (blkRead(&SDCD1, startblk, buf, 1)) {

+        chprintf(chp, "failed\r\n");

+        goto exittest;

       }

-      else{

-        chprintf(chp, "OK\r\n");

+      n++;

+    } while (chVTIsSystemTimeWithin(start, end));

+    chprintf(chp, "%D blocks/S, %D bytes/S\r\n", n, n * MMCSD_BLOCK_SIZE);

+

+    /* Multiple sequential blocks read performance, aligned.*/

+    chprintf(chp, "16 sequential blocks aligned read performance:   ");

+    start = chVTGetSystemTime();

+    end = start + MS2ST(1000);

+    n = 0;

+    do {

+      if (blkRead(&SDCD1, startblk, buf, SDC_BURST_SIZE)) {

+        chprintf(chp, "failed\r\n");

+        goto exittest;

       }

-    }

-

-    chprintf(chp, "Umount filesystem... ");

-    f_mount(0, NULL);

-    chprintf(chp, "OK\r\n");

-

-    chprintf(chp, "Disconnecting from SDIO...");

-    chThdSleepMilliseconds(100);

-    if (sdcDisconnect(&SDCD1))

-      chSysHalt();

-    chprintf(chp, " OK\r\n");

-    chprintf(chp, "------------------------------------------------------\r\n");

-    chprintf(chp, "All tests passed successfully.\r\n");

-    chThdSleepMilliseconds(100);

-  }

-  else{

-    chSysHalt();

+      n += SDC_BURST_SIZE;

+    } while (chVTIsSystemTimeWithin(start, end));

+    chprintf(chp, "%D blocks/S, %D bytes/S\r\n", n, n * MMCSD_BLOCK_SIZE);

+

+#if STM32_SDC_SDIO_UNALIGNED_SUPPORT

+    /* Single block read performance, unaligned.*/

+    chprintf(chp, "Single block unaligned read performance:         ");

+    start = chVTGetSystemTime();

+    end = start + MS2ST(1000);

+    n = 0;

+    do {

+      if (blkRead(&SDCD1, startblk, buf + 1, 1)) {

+        chprintf(chp, "failed\r\n");

+        goto exittest;

+      }

+      n++;

+    } while (chVTIsSystemTimeWithin(start, end));

+    chprintf(chp, "%D blocks/S, %D bytes/S\r\n", n, n * MMCSD_BLOCK_SIZE);

+

+    /* Multiple sequential blocks read performance, unaligned.*/

+    chprintf(chp, "16 sequential blocks unaligned read performance: ");

+    start = chVTGetSystemTime();

+    end = start + MS2ST(1000);

+    n = 0;

+    do {

+      if (blkRead(&SDCD1, startblk, buf + 1, SDC_BURST_SIZE)) {

+        chprintf(chp, "failed\r\n");

+        goto exittest;

+      }

+      n += SDC_BURST_SIZE;

+    } while (chVTIsSystemTimeWithin(start, end));

+    chprintf(chp, "%D blocks/S, %D bytes/S\r\n", n, n * MMCSD_BLOCK_SIZE);

+#endif /* STM32_SDC_SDIO_UNALIGNED_SUPPORT */

   }

-}

 

+  if ((strcmp(argv[0], "write") == 0) ||

+      (strcmp(argv[0], "all") == 0)) {

 

-/*

- * SDIO configuration.

- */

-static const SDCConfig sdccfg = {

-  0

-};

+  }

+

+  /* Card disconnect and command end.*/

+exittest:

+  sdcDisconnect(&SDCD1);

+}

 

-/**

- *

- */

-static SerialConfig ser_cfg = {

-    115200,

-    0,

-    0,

-    0,

-};

 static const ShellCommand commands[] = {

-  {"sdiotest", cmd_sdiotest},

+  {"sdc", cmd_sdc},

   {NULL, NULL}

 };

+

 static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream *)&SD2,

+  (BaseSequentialStream *)&SD6,

   commands

 };

 

@@ -357,14 +176,27 @@ static const ShellConfig shell_cfg1 = {
  * Application entry point.

  */

 int main(void) {

+  thread_t *shelltp = NULL;

+

+  /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

   halInit();

   chSysInit();

 

-  /* start debugging serial link */

-  sdStart(&SD2, &ser_cfg);

+  /*

+   * Shell manager initialization.

+   */

   shellInit();

-  static WORKING_AREA(waShell, 2048);

-  shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO);

+

+  /*

+   * Activates the serial driver 6 using the driver default configuration.

+   */

+  sdStart(&SD6, NULL);

 

   /*

    * Initializes the SDIO drivers.

@@ -372,11 +204,20 @@ int main(void) {
   sdcStart(&SDCD1, &sdccfg);

 

   /*

-   * Normal main() thread activity.

-   * Blinking signaling about successful passing.

+   * Creates the blinker thread.

+   */

+  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

+

+  /*

+   * Normal main() thread activity, in this demo it does nothing.

    */

   while (TRUE) {

-    palTogglePad(GPIOB, GPIOB_LED_R);

-    chThdSleepMilliseconds(100);

+    if (!shelltp)

+      shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

+    else if (chThdTerminatedX(shelltp)) {

+      chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

+      shelltp = NULL;           /* Triggers spawning of a new shell.        */

+    }

+    chThdSleepMilliseconds(1000);

   }

 }

diff --git a/testhal/STM32F4xx/SDC/mcuconf.h b/testhal/STM32F4xx/SDC/mcuconf.h
index 2a16dc0f0..62f693419 100644
--- a/testhal/STM32F4xx/SDC/mcuconf.h
+++ b/testhal/STM32F4xx/SDC/mcuconf.h
@@ -41,7 +41,7 @@
 #define STM32_CLOCK48_REQUIRED              TRUE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

-#define STM32_PLLM_VALUE                    8

+#define STM32_PLLM_VALUE                    12

 #define STM32_PLLN_VALUE                    336

 #define STM32_PLLP_VALUE                    2

 #define STM32_PLLQ_VALUE                    7

@@ -65,9 +65,9 @@
  * ADC driver system settings.

  */

 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_USE_ADC2                  FALSE

-#define STM32_ADC_USE_ADC3                  FALSE

+#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC2                  TRUE

+#define STM32_ADC_USE_ADC3                  TRUE

 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(2, 4)

 #define STM32_ADC_ADC2_DMA_STREAM           STM32_DMA_STREAM_ID(2, 2)

 #define STM32_ADC_ADC3_DMA_STREAM           STM32_DMA_STREAM_ID(2, 1)

@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,14 +203,25 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             TRUE

+#define STM32_SERIAL_USE_USART2             FALSE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USE_USART6             FALSE

+#define STM32_SERIAL_USE_USART6             TRUE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/SDC/readme.txt b/testhal/STM32F4xx/SDC/readme.txt
index b897676af..1daeb6c94 100644
--- a/testhal/STM32F4xx/SDC/readme.txt
+++ b/testhal/STM32F4xx/SDC/readme.txt
@@ -4,7 +4,7 @@
 

 ** TARGET **

 

-The demo runs on an Olimex ST_STM3210E_EVAL board.

+The demo runs on an Olimex STM32-E407 board.

 

 ** The Demo **

 

diff --git a/testhal/STM32F4xx/SPI/.cproject b/testhal/STM32F4xx/SPI/.cproject
index 6b2c42453..e05dca097 100644
--- a/testhal/STM32F4xx/SPI/.cproject
+++ b/testhal/STM32F4xx/SPI/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F4xx/SPI/.project b/testhal/STM32F4xx/SPI/.project
index effebe09e..cbee7f6e6 100644
--- a/testhal/STM32F4xx/SPI/.project
+++ b/testhal/STM32F4xx/SPI/.project
@@ -27,7 +27,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/testhal/STM32F4xx/SPI/Makefile b/testhal/STM32F4xx/SPI/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/SPI/Makefile
+++ b/testhal/STM32F4xx/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/SPI/chconf.h b/testhal/STM32F4xx/SPI/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/SPI/chconf.h
+++ b/testhal/STM32F4xx/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/SPI/halconf.h b/testhal/STM32F4xx/SPI/halconf.h
index 3e1cafbbf..99f546dd1 100644
--- a/testhal/STM32F4xx/SPI/halconf.h
+++ b/testhal/STM32F4xx/SPI/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/SPI/main.c b/testhal/STM32F4xx/SPI/main.c
index 04999434b..3028c2113 100644
--- a/testhal/STM32F4xx/SPI/main.c
+++ b/testhal/STM32F4xx/SPI/main.c
@@ -46,7 +46,7 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

 static msg_t spi_thread_1(void *p) {

 

   (void)p;

@@ -67,7 +67,7 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

 static msg_t spi_thread_2(void *p) {

 

   (void)p;

diff --git a/testhal/STM32F4xx/SPI/mcuconf.h b/testhal/STM32F4xx/SPI/mcuconf.h
index acaa05728..2df7c0f29 100644
--- a/testhal/STM32F4xx/SPI/mcuconf.h
+++ b/testhal/STM32F4xx/SPI/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/UART/.project b/testhal/STM32F4xx/UART/.project
index 06e8b52e8..8ba48d6a8 100644
--- a/testhal/STM32F4xx/UART/.project
+++ b/testhal/STM32F4xx/UART/.project
@@ -27,7 +27,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/testhal/STM32F4xx/UART/Makefile b/testhal/STM32F4xx/UART/Makefile
index 86de6d81c..12616439a 100644
--- a/testhal/STM32F4xx/UART/Makefile
+++ b/testhal/STM32F4xx/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ 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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,9 +98,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

-       $(CHIBIOS)/os/various/chprintf.c \

        main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -115,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -140,6 +156,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -160,29 +177,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -205,18 +199,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/UART/chconf.h b/testhal/STM32F4xx/UART/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/UART/chconf.h
+++ b/testhal/STM32F4xx/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/UART/halconf.h b/testhal/STM32F4xx/UART/halconf.h
index 520e71b0a..e9b103442 100644
--- a/testhal/STM32F4xx/UART/halconf.h
+++ b/testhal/STM32F4xx/UART/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/UART/main.c b/testhal/STM32F4xx/UART/main.c
index fcd6fa965..3f01dc1a1 100644
--- a/testhal/STM32F4xx/UART/main.c
+++ b/testhal/STM32F4xx/UART/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt3, vt4, vt5;

+static virtual_timer_t vt3, vt4, vt5;

 

 static const uint8_t message[] = "0123456789ABCDEF";

 static uint8_t buffer[16];

@@ -56,11 +56,10 @@ static void txend2(UARTDriver *uartp) {
 

   (void)uartp;

   palSetPad(GPIOD, GPIOD_LED5);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt5))

-    chVTResetI(&vt5);

+  chSysLockFromISR();

+  chVTResetI(&vt5);

   chVTSetI(&vt5, MS2ST(200), led5off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -83,11 +82,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
   (void)c;

   /* Flashing the LED each time a character is received.*/

   palSetPad(GPIOD, GPIOD_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  chSysLockFromISR();

+  chVTResetI(&vt4);

   chVTSetI(&vt4, MS2ST(200), led4off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -99,11 +97,10 @@ static void rxend(UARTDriver *uartp) {
 

   /* Flashing the LED each time a character is received.*/

   palSetPad(GPIOD, GPIOD_LED3);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt3))

-    chVTResetI(&vt3);

+  chSysLockFromISR();

+  chVTResetI(&vt3);

   chVTSetI(&vt3, MS2ST(200), led3off, NULL);

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32F4xx/UART/mcuconf.h b/testhal/STM32F4xx/UART/mcuconf.h
index 341047cda..1ed301f80 100644
--- a/testhal/STM32F4xx/UART/mcuconf.h
+++ b/testhal/STM32F4xx/UART/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32F4xx/USB_CDC/.project b/testhal/STM32F4xx/USB_CDC/.project
index 135abc544..defd5f312 100644
--- a/testhal/STM32F4xx/USB_CDC/.project
+++ b/testhal/STM32F4xx/USB_CDC/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/OLIMEX_STM32_E407</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32F4xx/USB_CDC/Makefile b/testhal/STM32F4xx/USB_CDC/Makefile
index 8c329e2d7..41b4492a1 100644
--- a/testhal/STM32F4xx/USB_CDC/Makefile
+++ b/testhal/STM32F4xx/USB_CDC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,15 +51,21 @@ endif
 # Architecture or project specific options

 #

 

-# Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FPU),)

-  USE_FPU = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -65,16 +81,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/OLIMEX_STM32_E407/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)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,6 +98,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        $(CHIBIOS)/os/various/shell.c \

@@ -116,7 +133,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -141,6 +158,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -161,29 +179,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -206,18 +201,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32F4xx/USB_CDC/chconf.h b/testhal/STM32F4xx/USB_CDC/chconf.h
index 2e6fcc6ee..b6ca0aa69 100644
--- a/testhal/STM32F4xx/USB_CDC/chconf.h
+++ b/testhal/STM32F4xx/USB_CDC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                32

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 10000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32F4xx/USB_CDC/halconf.h b/testhal/STM32F4xx/USB_CDC/halconf.h
index cd76b0cfe..bb8ebc123 100644
--- a/testhal/STM32F4xx/USB_CDC/halconf.h
+++ b/testhal/STM32F4xx/USB_CDC/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32F4xx/USB_CDC/main.c b/testhal/STM32F4xx/USB_CDC/main.c
index 8bdf3c0ba..dd01ecb25 100644
--- a/testhal/STM32F4xx/USB_CDC/main.c
+++ b/testhal/STM32F4xx/USB_CDC/main.c
@@ -285,7 +285,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   case USB_EVENT_ADDRESS:

     return;

   case USB_EVENT_CONFIGURED:

-    chSysLockFromIsr();

+    chSysLockFromISR();

 

     /* Enables the endpoints specified into the configuration.

        Note, this callback is invoked from an ISR so I-Class functions

@@ -296,7 +296,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Resetting the state of the CDC subsystem.*/

     sduConfigureHookI(&SDU2);

 

-    chSysUnlockFromIsr();

+    chSysUnlockFromISR();

     return;

   case USB_EVENT_SUSPEND:

     return;

@@ -332,8 +332,8 @@ static const SerialUSBConfig serusbcfg = {
 /* Command line related.                                                     */

 /*===========================================================================*/

 

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-#define TEST_WA_SIZE    THD_WA_SIZE(256)

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

   size_t n, size;

@@ -350,8 +350,8 @@ 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};

-  Thread *tp;

+  static const char *states[] = {CH_STATE_NAMES};

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

@@ -361,23 +361,23 @@ static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
   chprintf(chp, "    addr    stack prio refs     state time\r\n");

   tp = chRegFirstThread();

   do {

-    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",

+    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s\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);

+            states[tp->p_state]);

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }

 

 static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: test\r\n");

     return;

   }

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),

+  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

                            TestThread, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory\r\n");

@@ -437,7 +437,7 @@ static const ShellConfig shell_cfg1 = {
 /*

  * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

@@ -457,7 +457,8 @@ static msg_t Thread1(void *arg) {
  * Application entry point.

  */

 int main(void) {

-  Thread *shelltp = NULL;

+  static THD_WORKING_AREA(wa_usb_lld_pump, STM32_USB_OTG_THREAD_STACK_SIZE);

+  thread_t *shelltp = NULL;

 

   /*

    * System initializations.

@@ -480,6 +481,8 @@ int main(void) {
    * Note, a delay is inserted in order to not have to disconnect the cable

    * after a reset.

    */

+  chThdCreateStatic(wa_usb_lld_pump, sizeof(wa_usb_lld_pump),

+                    STM32_USB_OTG_THREAD_PRIO, usb_lld_pump, serusbcfg.usbp);

   usbDisconnectBus(serusbcfg.usbp);

   chThdSleepMilliseconds(1500);

   usbStart(serusbcfg.usbp, &usbcfg);

@@ -513,7 +516,7 @@ int main(void) {
   while (TRUE) {

     if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE))

       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

-    else if (chThdTerminated(shelltp)) {

+    else if (chThdTerminatedX(shelltp)) {

       chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

       shelltp = NULL;           /* Triggers spawning of a new shell.        */

     }

diff --git a/testhal/STM32F4xx/USB_CDC/mcuconf.h b/testhal/STM32F4xx/USB_CDC/mcuconf.h
index 5d8b3a470..160f4afec 100644
--- a/testhal/STM32F4xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32F4xx/USB_CDC/mcuconf.h
@@ -139,6 +139,7 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_USE_I2C3                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)

 #define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)

 #define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

@@ -151,9 +152,7 @@
 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

 #define STM32_I2C_I2C3_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -204,6 +203,17 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7

 

 /*

+ * SDC driver system settings.

+ */

+#define STM32_SDC_SDIO_DMA_PRIORITY         3

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#define STM32_SDC_WRITE_TIMEOUT_MS          250

+#define STM32_SDC_READ_TIMEOUT_MS           25

+#define STM32_SDC_CLOCK_ACTIVATION_DELAY    10

+#define STM32_SDC_SDIO_UNALIGNED_SUPPORT    TRUE

+#define STM32_SDC_SDIO_DMA_STREAM           STM32_DMA_STREAM_ID(2, 3)

+

+/*

  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

@@ -237,7 +247,13 @@
 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

 #define STM32_SPI_SPI3_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -272,7 +288,7 @@
 #define STM32_UART_UART4_DMA_PRIORITY       0

 #define STM32_UART_UART5_DMA_PRIORITY       0

 #define STM32_UART_USART6_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

diff --git a/testhal/STM32L1xx/ADC/.project b/testhal/STM32L1xx/ADC/.project
index 170610f4f..1cd6361af 100644
--- a/testhal/STM32L1xx/ADC/.project
+++ b/testhal/STM32L1xx/ADC/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/ADC/Makefile b/testhal/STM32L1xx/ADC/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/ADC/Makefile
+++ b/testhal/STM32L1xx/ADC/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/ADC/chconf.h b/testhal/STM32L1xx/ADC/chconf.h
index 2e6fcc6ee..68af751f1 100644
--- a/testhal/STM32L1xx/ADC/chconf.h
+++ b/testhal/STM32L1xx/ADC/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/ADC/halconf.h b/testhal/STM32L1xx/ADC/halconf.h
index 85a5dbd3b..23d81defc 100644
--- a/testhal/STM32L1xx/ADC/halconf.h
+++ b/testhal/STM32L1xx/ADC/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                  TRUE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

 #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)

@@ -80,6 +73,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/ADC/main.c b/testhal/STM32L1xx/ADC/main.c
index 9ca4b541f..8a2b3897b 100644
--- a/testhal/STM32L1xx/ADC/main.c
+++ b/testhal/STM32L1xx/ADC/main.c
@@ -94,10 +94,11 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

+

   chRegSetThreadName("blinker");

   while (TRUE) {

     palSetPad(GPIOB, GPIOB_LED4);

diff --git a/testhal/STM32L1xx/ADC/mcuconf.h b/testhal/STM32L1xx/ADC/mcuconf.h
index f0bf4a0cc..4f936d8b3 100644
--- a/testhal/STM32L1xx/ADC/mcuconf.h
+++ b/testhal/STM32L1xx/ADC/mcuconf.h
@@ -96,12 +96,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -146,7 +146,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -160,12 +166,12 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

diff --git a/testhal/STM32L1xx/EXT/.project b/testhal/STM32L1xx/EXT/.project
index c24be83e5..07851af6f 100644
--- a/testhal/STM32L1xx/EXT/.project
+++ b/testhal/STM32L1xx/EXT/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/EXT/Makefile b/testhal/STM32L1xx/EXT/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/EXT/Makefile
+++ b/testhal/STM32L1xx/EXT/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/EXT/chconf.h b/testhal/STM32L1xx/EXT/chconf.h
index 2e6fcc6ee..68af751f1 100644
--- a/testhal/STM32L1xx/EXT/chconf.h
+++ b/testhal/STM32L1xx/EXT/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/EXT/halconf.h b/testhal/STM32L1xx/EXT/halconf.h
index e0e0c38ff..aafa92685 100644
--- a/testhal/STM32L1xx/EXT/halconf.h
+++ b/testhal/STM32L1xx/EXT/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/EXT/main.c b/testhal/STM32L1xx/EXT/main.c
index c0820d139..218826786 100644
--- a/testhal/STM32L1xx/EXT/main.c
+++ b/testhal/STM32L1xx/EXT/main.c
@@ -25,17 +25,16 @@ static void led4off(void *arg) {
 

 /* Triggered when the button is pressed or released. The LED4 is set to ON.*/

 static void extcb1(EXTDriver *extp, expchannel_t channel) {

-  static VirtualTimer vt4;

+  static virtual_timer_t vt4;

 

   (void)extp;

   (void)channel;

   palSetPad(GPIOB, GPIOB_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt4))

-    chVTResetI(&vt4);

+  chSysLockFromISR();

+  chVTResetI(&vt4);

   /* LED4 set to OFF after 200mS.*/

-  chVTSetI(&vt4, MS2ST(200), led4off, NULL);

-  chSysUnlockFromIsr();

+  chVTDoSetI(&vt4, MS2ST(200), led4off, NULL);

+  chSysUnlockFromISR();

 }

 

 static const EXTConfig extcfg = {

diff --git a/testhal/STM32L1xx/IRQ_STORM/.project b/testhal/STM32L1xx/IRQ_STORM/.project
index 5cc197397..9fd81bee3 100644
--- a/testhal/STM32L1xx/IRQ_STORM/.project
+++ b/testhal/STM32L1xx/IRQ_STORM/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/IRQ_STORM/Makefile b/testhal/STM32L1xx/IRQ_STORM/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32L1xx/IRQ_STORM/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/IRQ_STORM/chconf.h b/testhal/STM32L1xx/IRQ_STORM/chconf.h
index f943ea80c..a1963f74c 100644
--- a/testhal/STM32L1xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32L1xx/IRQ_STORM/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   FALSE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

+#define CH_DBG_ENABLE_TRACE                 FALSE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             FALSE

-#endif

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/IRQ_STORM/halconf.h b/testhal/STM32L1xx/IRQ_STORM/halconf.h
index 117a5979b..8a0de4278 100644
--- a/testhal/STM32L1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32L1xx/IRQ_STORM/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/IRQ_STORM/main.c b/testhal/STM32L1xx/IRQ_STORM/main.c
index ac3909c0c..c66bd7e13 100644
--- a/testhal/STM32L1xx/IRQ_STORM/main.c
+++ b/testhal/STM32L1xx/IRQ_STORM/main.c
@@ -46,18 +46,18 @@
 #define MSG_SEND_LEFT   0

 #define MSG_SEND_RIGHT  1

 

-static bool_t saturated;

+static bool saturated;

 

 /*

  * Mailboxes and buffers.

  */

-static Mailbox mb[NUM_THREADS];

+static mailbox_t mb[NUM_THREADS];

 static msg_t b[NUM_THREADS][MAILBOX_SIZE];

 

 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -101,7 +101,7 @@ static msg_t WorkerThread(void *arg) {
       /* If this thread is not at the end of a chain re-sending the message,

          note this check works because the variable target is unsigned.*/

       msg = chMBPost(&mb[target], msg, TIME_IMMEDIATE);

-      if (msg != RDY_OK)

+      if (msg != MSG_OK)

         saturated = TRUE;

     }

     else {

@@ -117,15 +117,15 @@ static msg_t WorkerThread(void *arg) {
 /*

  * GPT2 callback.

  */

-static void gpt2cb(GPTDriver *gptp) {

+static void gpt4cb(GPTDriver *gptp) {

   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[0], MSG_SEND_RIGHT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

@@ -135,19 +135,20 @@ static void gpt3cb(GPTDriver *gptp) {
   msg_t msg;

 

   (void)gptp;

-  chSysLockFromIsr();

+  chSysLockFromISR();

   msg = chMBPostI(&mb[NUM_THREADS - 1], MSG_SEND_LEFT);

-  if (msg != RDY_OK)

+  if (msg != MSG_OK)

     saturated = TRUE;

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 /*

  * GPT2 configuration.

  */

-static const GPTConfig gpt2cfg = {

+static const GPTConfig gpt4cfg = {

   1000000,  /* 1MHz timer clock.*/

-  gpt2cb,   /* Timer callback.*/

+  gpt4cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -157,6 +158,7 @@ static const GPTConfig gpt2cfg = {
 static const GPTConfig gpt3cfg = {

   1000000,  /* 1MHz timer clock.*/

   gpt3cb,   /* Timer callback.*/

+  0,

   0

 };

 

@@ -212,19 +214,23 @@ int main(void) {
   chSysInit();

 

   /*

-   * Prepares the Serial driver 1 and GPT drivers 2 and 3.

+   * Activates the serial driver 1, PA9 and PA10 are routed to USART1.

    */

-  sdStart(&SD1, NULL);          /* Default is 38400-8-N-1.*/

-  palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7));

-  palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7));

-  gptStart(&GPTD2, &gpt2cfg);

+  sdStart(&SD1, NULL);

+  palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7));       /* USART1 TX.       */

+  palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7));      /* USART1 RX.       */

+

+  /*

+   * Activates GPTs.

+   */

+  gptStart(&GPTD4, &gpt4cfg);

   gptStart(&GPTD3, &gpt3cfg);

 

   /*

    * Initializes the mailboxes and creates the worker threads.

    */

   for (i = 0; i < NUM_THREADS; i++) {

-    chMBInit(&mb[i], b[i], MAILBOX_SIZE);

+    chMBObjectInit(&mb[i], b[i], MAILBOX_SIZE);

     chThdCreateStatic(waWorkerThread[i], sizeof waWorkerThread[i],

                       NORMALPRIO - 20, WorkerThread, (void *)i);

   }

@@ -239,19 +245,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

@@ -286,11 +292,11 @@ int main(void) {
     println("");

     saturated = FALSE;

     threshold = 0;

-    for (interval = 2000; interval >= 20; interval -= interval / 10) {

-      gptStartContinuous(&GPTD2, interval - 1); /* Slightly out of phase.*/

+    for (interval = 2000; interval >= 10; interval -= interval / 10) {

+      gptStartContinuous(&GPTD4, interval - 1); /* Slightly out of phase.*/

       gptStartContinuous(&GPTD3, interval + 1); /* Slightly out of phase.*/

       chThdSleepMilliseconds(1000);

-      gptStopTimer(&GPTD2);

+      gptStopTimer(&GPTD4);

       gptStopTimer(&GPTD3);

       if (!saturated)

         print(".");

@@ -311,7 +317,7 @@ int main(void) {
     if (threshold > worst)

       worst = threshold;

   }

-  gptStopTimer(&GPTD2);

+  gptStopTimer(&GPTD4);

   gptStopTimer(&GPTD3);

 

   print("Worst case at ");

@@ -326,5 +332,4 @@ int main(void) {
   while (TRUE) {

     chThdSleepMilliseconds(5000);

   }

-  return 0;

 }

diff --git a/testhal/STM32L1xx/IRQ_STORM/mcuconf.h b/testhal/STM32L1xx/IRQ_STORM/mcuconf.h
index e73375db2..50ded9f4a 100644
--- a/testhal/STM32L1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32L1xx/IRQ_STORM/mcuconf.h
@@ -84,24 +84,24 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  TRUE

-#define STM32_GPT_USE_TIM4                  FALSE

-#define STM32_GPT_TIM2_IRQ_PRIORITY         6

+#define STM32_GPT_USE_TIM4                  TRUE

+#define STM32_GPT_TIM2_IRQ_PRIORITY         7

 #define STM32_GPT_TIM3_IRQ_PRIORITY         10

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM4_IRQ_PRIORITY         6

 

 /*

  * I2C driver system settings.

  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -146,7 +146,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -160,12 +166,12 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

diff --git a/testhal/STM32L1xx/PWM-ICU/.project b/testhal/STM32L1xx/PWM-ICU/.project
index 393dbac2d..9b7b1ba58 100644
--- a/testhal/STM32L1xx/PWM-ICU/.project
+++ b/testhal/STM32L1xx/PWM-ICU/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/PWM-ICU/Makefile b/testhal/STM32L1xx/PWM-ICU/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/PWM-ICU/Makefile
+++ b/testhal/STM32L1xx/PWM-ICU/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/PWM-ICU/chconf.h b/testhal/STM32L1xx/PWM-ICU/chconf.h
index 2e6fcc6ee..68af751f1 100644
--- a/testhal/STM32L1xx/PWM-ICU/chconf.h
+++ b/testhal/STM32L1xx/PWM-ICU/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/PWM-ICU/halconf.h b/testhal/STM32L1xx/PWM-ICU/halconf.h
index 2f74c82c8..a5adf535c 100644
--- a/testhal/STM32L1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32L1xx/PWM-ICU/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/PWM-ICU/mcuconf.h b/testhal/STM32L1xx/PWM-ICU/mcuconf.h
index 961a41c01..ee982438b 100644
--- a/testhal/STM32L1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32L1xx/PWM-ICU/mcuconf.h
@@ -96,12 +96,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -146,7 +146,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  4

 

 /*

  * UART driver system settings.

@@ -160,12 +166,12 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

diff --git a/testhal/STM32L1xx/SPI/.project b/testhal/STM32L1xx/SPI/.project
index aef073cf3..5e89c246f 100644
--- a/testhal/STM32L1xx/SPI/.project
+++ b/testhal/STM32L1xx/SPI/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/SPI/Makefile b/testhal/STM32L1xx/SPI/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/SPI/Makefile
+++ b/testhal/STM32L1xx/SPI/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/SPI/chconf.h b/testhal/STM32L1xx/SPI/chconf.h
index 2e6fcc6ee..68af751f1 100644
--- a/testhal/STM32L1xx/SPI/chconf.h
+++ b/testhal/STM32L1xx/SPI/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/SPI/halconf.h b/testhal/STM32L1xx/SPI/halconf.h
index 3e1cafbbf..6549d25d6 100644
--- a/testhal/STM32L1xx/SPI/halconf.h
+++ b/testhal/STM32L1xx/SPI/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/SPI/main.c b/testhal/STM32L1xx/SPI/main.c
index da394e97b..4931106fd 100644
--- a/testhal/STM32L1xx/SPI/main.c
+++ b/testhal/STM32L1xx/SPI/main.c
@@ -46,10 +46,11 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

-static msg_t spi_thread_1(void *p) {

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

+static THD_FUNCTION(spi_thread_1, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 1");

   while (TRUE) {

     spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

@@ -67,10 +68,11 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

-static msg_t spi_thread_2(void *p) {

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

+static THD_FUNCTION(spi_thread_2, p) {

 

   (void)p;

+

   chRegSetThreadName("SPI thread 2");

   while (TRUE) {

     spiAcquireBus(&SPID2);              /* Acquire ownership of the bus.    */

diff --git a/testhal/STM32L1xx/SPI/mcuconf.h b/testhal/STM32L1xx/SPI/mcuconf.h
index a992d3419..f91b311e4 100644
--- a/testhal/STM32L1xx/SPI/mcuconf.h
+++ b/testhal/STM32L1xx/SPI/mcuconf.h
@@ -96,12 +96,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -146,7 +146,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -160,12 +166,12 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

diff --git a/testhal/STM32L1xx/UART/.project b/testhal/STM32L1xx/UART/.project
index ac58d7107..ef391b72f 100644
--- a/testhal/STM32L1xx/UART/.project
+++ b/testhal/STM32L1xx/UART/.project
@@ -25,11 +25,6 @@
 	</natures>

 	<linkedResources>

 		<link>

-			<name>board</name>

-			<type>2</type>

-			<locationURI>CHIBIOS/boards/ST_STM32L_DISCOVERY</locationURI>

-		</link>

-		<link>

 			<name>os</name>

 			<type>2</type>

 			<locationURI>CHIBIOS/os</locationURI>

diff --git a/testhal/STM32L1xx/UART/Makefile b/testhal/STM32L1xx/UART/Makefile
index 0d3a8e2b2..ad1bb67f8 100644
--- a/testhal/STM32L1xx/UART/Makefile
+++ b/testhal/STM32L1xx/UART/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +51,16 @@ endif
 # Architecture or project specific options

 #

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

 #

@@ -59,12 +76,13 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/ST_STM32L_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32L1xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32L1xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-#include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32L_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/platform.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32L152xB.ld

@@ -75,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -107,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -132,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -152,29 +172,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -197,11 +194,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32L1xx/UART/chconf.h b/testhal/STM32L1xx/UART/chconf.h
index 2e6fcc6ee..68af751f1 100644
--- a/testhal/STM32L1xx/UART/chconf.h
+++ b/testhal/STM32L1xx/UART/chconf.h
@@ -30,19 +30,42 @@
 

 /*===========================================================================*/

 /**

- * @name Kernel parameters and options

+ * @name System timers settings

  * @{

  */

 /*===========================================================================*/

 

 /**

+ * @brief   System time counter resolution.

+ * @note    Allowed values are 16 or 32 bits.

+ */

+#define CH_CFG_ST_RESOLUTION                16

+

+/**

  * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

+#define CH_CFG_ST_FREQUENCY                 1000

+

+/**

+ * @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.

+ */

+#define CH_CFG_ST_TIMEDELTA                 2

+

+/** @} */

+

+/*===========================================================================*/

+/**

+ * @name Kernel parameters and options

+ * @{

+ */

+/*===========================================================================*/

 

 /**

  * @brief   Round robin interval.

@@ -51,13 +74,12 @@
  *          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

-#endif

+#define CH_CFG_TIME_QUANTUM                 0

 

 /**

  * @brief   Managed RAM size.

@@ -68,28 +90,17 @@
  *

  * @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

-#endif

+#define CH_CFG_MEMCORE_SIZE                 0

 

 /**

  * @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

-#endif

+ *          does not spawn the idle thread. The application @p main()

+ *          function becomes the idle thread and must implement an

+ *          infinite loop. */

+#define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

 

@@ -108,9 +119,7 @@
  * @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

-#endif

+#define CH_CFG_OPTIMIZE_SPEED               TRUE

 

 /** @} */

 

@@ -122,14 +131,21 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Time Measurement APIs.

+ * @details If enabled then the time measurement APIs are included in

+ *          the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#define CH_CFG_USE_TM                       TRUE

+

+/**

  * @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

-#endif

+#define CH_CFG_USE_REGISTRY                 TRUE

 

 /**

  * @brief   Threads synchronization APIs.

@@ -138,9 +154,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

+#define CH_CFG_USE_WAITEXIT                 TRUE

 

 /**

  * @brief   Semaphores APIs.

@@ -148,43 +162,36 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

+#define CH_CFG_USE_SEMAPHORES               TRUE

 

 /**

  * @brief   Semaphores queuing mode.

  * @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.

+ * @note    The default is @p FALSE. Enable this if you have special

+ *          requirements.

+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES_PRIORITY      FALSE

-#endif

+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

 

 /**

- * @brief   Atomic semaphore API.

- * @details If enabled then the semaphores the @p chSemSignalWait() API

- *          is included in the kernel.

+ * @brief   Mutexes APIs.

+ * @details If enabled then the mutexes APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

+#define CH_CFG_USE_MUTEXES                  TRUE

 

 /**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

+ * @brief   Enables recursive behavior on mutexes.

+ * @note    Recursive mutexes are heavier and have an increased

+ *          memory footprint.

  *

- * @note    The default is @p TRUE.

+ * @note    The default is @p FALSE.

+ * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

 

 /**

  * @brief   Conditional Variables APIs.

@@ -192,11 +199,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS                 TRUE

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -204,11 +209,9 @@
  *          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

-#endif

+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

 

 /**

  * @brief   Events Flags APIs.

@@ -216,9 +219,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

+#define CH_CFG_USE_EVENTS                   TRUE

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -226,11 +227,9 @@
  *          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

-#endif

+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -239,21 +238,18 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

+#define CH_CFG_USE_MESSAGES                 TRUE

 

 /**

  * @brief   Synchronous Messages queuing mode.

  * @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

-#endif

+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

 

 /**

  * @brief   Mailboxes APIs.

@@ -261,11 +257,9 @@
  *          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

-#endif

+#define CH_CFG_USE_MAILBOXES                TRUE

 

 /**

  * @brief   I/O Queues APIs.

@@ -273,9 +267,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

+#define CH_CFG_USE_QUEUES                   TRUE

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,9 +276,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

+#define CH_CFG_USE_MEMCORE                  TRUE

 

 /**

  * @brief   Heap Allocator APIs.

@@ -294,27 +284,11 @@
  *          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

-#endif

+#define CH_CFG_USE_HEAP                     TRUE

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -323,9 +297,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

+#define CH_CFG_USE_MEMPOOLS                 TRUE

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -333,12 +305,10 @@
  *          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

-#endif

+#define CH_CFG_USE_DYNAMIC                  TRUE

 

 /** @} */

 

@@ -350,15 +320,20 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Debug option, kernel statistics.

+ *

+ * @note    The default is @p FALSE.

+ */

+#define CH_DBG_STATISTICS                   TRUE

+

+/**

  * @brief   Debug option, system state check.

  * @details If enabled the correct call protocol for system APIs is checked

  *          at runtime.

  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

-#endif

+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -367,9 +342,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            TRUE

-#endif

+#define CH_DBG_ENABLE_CHECKS                TRUE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -379,9 +352,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           TRUE

-#endif

+#define CH_DBG_ENABLE_ASSERTS               TRUE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -390,9 +361,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

-#endif

+#define CH_DBG_ENABLE_TRACE                 TRUE

 

 /**

  * @brief   Debug option, stack checks.

@@ -404,9 +373,7 @@
  * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       TRUE

-#endif

+#define CH_DBG_ENABLE_STACK_CHECK           TRUE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -416,22 +383,18 @@
  *

  * @note    The default is @p FALSE.

  */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#define CH_DBG_FILL_THREADS             TRUE

-#endif

+#define CH_DBG_FILL_THREADS                 TRUE

 

 /**

  * @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

-#endif

+#define CH_DBG_THREADS_PROFILING            FALSE

 

 /** @} */

 

@@ -444,12 +407,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                                                   \

+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \

   /* Add threads custom fields here.*/

-#endif

 

 /**

  * @brief   Threads initialization hook.

@@ -458,11 +419,9 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \

   /* Add threads initialization code here.*/                                \

 }

-#endif

 

 /**

  * @brief   Threads finalization hook.

@@ -472,53 +431,61 @@
  * @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) {                                          \

+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

 }

-#endif

 

 /**

  * @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) {                              \

+#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.

+ */

+#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+}

+

+/**

+ * @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.

+ */

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+}

 

 /**

  * @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() {                                                  \

+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \

   /* Idle loop code here.*/                                                 \

 }

-#endif

 

 /**

  * @brief   System tick event hook.

  * @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() {                                          \

+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \

   /* System tick event code here.*/                                         \

 }

-#endif

 

 /**

  * @brief   System halt hook.

  * @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() {                                                \

+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

 }

-#endif

 

 /** @} */

 

diff --git a/testhal/STM32L1xx/UART/halconf.h b/testhal/STM32L1xx/UART/halconf.h
index 520e71b0a..243190f6d 100644
--- a/testhal/STM32L1xx/UART/halconf.h
+++ b/testhal/STM32L1xx/UART/halconf.h
@@ -80,6 +80,13 @@
 #endif

 

 /**

+ * @brief   Enables the I2S subsystem.

+ */

+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)

+#define HAL_USE_I2S                 FALSE

+#endif

+

+/**

  * @brief   Enables the ICU subsystem.

  */

 #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

diff --git a/testhal/STM32L1xx/UART/main.c b/testhal/STM32L1xx/UART/main.c
index 01a8c8cd9..f8b19014c 100644
--- a/testhal/STM32L1xx/UART/main.c
+++ b/testhal/STM32L1xx/UART/main.c
@@ -17,15 +17,15 @@
 #include "ch.h"

 #include "hal.h"

 

-static VirtualTimer vt1, vt2;

+static virtual_timer_t vt1, vt2;

 

 static void restart(void *p) {

 

   (void)p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   uartStartSendI(&UARTD1, 14, "Hello World!\r\n");

-  chSysUnlockFromIsr();

+  chSysUnlockFromISR();

 }

 

 static void ledoff(void *p) {

@@ -51,11 +51,10 @@ static void txend2(UARTDriver *uartp) {
 

   (void)uartp;

   palClearPad(GPIOB, GPIOB_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt1))

-    chVTResetI(&vt1);

-  chVTSetI(&vt1, MS2ST(5000), restart, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt1);

+  chVTDoSetI(&vt1, MS2ST(5000), restart, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

@@ -78,11 +77,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) {
   (void)c;

   /* Flashing the LED each time a character is received.*/

   palSetPad(GPIOB, GPIOB_LED4);

-  chSysLockFromIsr();

-  if (chVTIsArmedI(&vt2))

-    chVTResetI(&vt2);

-  chVTSetI(&vt2, MS2ST(200), ledoff, NULL);

-  chSysUnlockFromIsr();

+  chSysLockFromISR();

+  chVTResetI(&vt2);

+  chVTDoSetI(&vt2, MS2ST(200), ledoff, NULL);

+  chSysUnlockFromISR();

 }

 

 /*

diff --git a/testhal/STM32L1xx/UART/mcuconf.h b/testhal/STM32L1xx/UART/mcuconf.h
index ee338ce96..77c9df342 100644
--- a/testhal/STM32L1xx/UART/mcuconf.h
+++ b/testhal/STM32L1xx/UART/mcuconf.h
@@ -96,12 +96,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_BUSY_TIMEOUT              50

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

 

 /*

  * ICU driver system settings.

@@ -146,7 +146,13 @@
 #define STM32_SPI_SPI2_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

+

+/*

+ * ST driver system settings.

+ */

+#define STM32_ST_IRQ_PRIORITY               8

+#define STM32_ST_USE_TIMER                  2

 

 /*

  * UART driver system settings.

@@ -160,12 +166,12 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

-#define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

diff --git a/testhal/STM8S/SPI/ChibiOS-RT.stw b/testhal/STM8S/SPI/ChibiOS-RT.stw
deleted file mode 100644
index a6630271a..000000000
--- a/testhal/STM8S/SPI/ChibiOS-RT.stw
+++ /dev/null
@@ -1,16 +0,0 @@
-;	STMicroelectronics Workspace file

-

-[Version]

-Keyword=ST7Workspace-V0.7

-

-[Project0]

-Filename=cosmic\cosmic.stp

-Dependencies=

-

-[Project1]

-Filename=raisonance\raisonance.stp

-Dependencies=

-[Options]

-ActiveProject=cosmic

-ActiveConfig=Release

-AddSortedElements=0

diff --git a/testhal/STM8S/SPI/cosmic/cosmic.stp b/testhal/STM8S/SPI/cosmic/cosmic.stp
deleted file mode 100644
index f45146b03..000000000
--- a/testhal/STM8S/SPI/cosmic/cosmic.stp
+++ /dev/null
@@ -1,1947 +0,0 @@
-;	STMicroelectronics Project file

-

-[Version]

-Keyword=ST7Project

-Number=1.3

-

-[Project]

-Name=cosmic

-Toolset=STM8 Cosmic

-

-[Config]

-0=Config.0

-1=Config.1

-

-[Config.0]

-ConfigName=Debug

-Target=$(ProjectSFile).elf

-OutputFolder=Debug

-Debug=$(TargetFName)

-

-[Config.1]

-ConfigName=Release

-Target=$(ProjectSFile).elf

-OutputFolder=Release

-Debug=$(TargetFName)

-

-[Root]

-ElemType=Project

-PathName=cosmic

-Child=Root.Source Files

-Config.0=Root.Config.0

-Config.1=Root.Config.1

-

-[Root.Config.0]

-Settings.0.0=Root.Config.0.Settings.0

-Settings.0.1=Root.Config.0.Settings.1

-Settings.0.2=Root.Config.0.Settings.2

-Settings.0.3=Root.Config.0.Settings.3

-Settings.0.4=Root.Config.0.Settings.4

-Settings.0.5=Root.Config.0.Settings.5

-Settings.0.6=Root.Config.0.Settings.6

-Settings.0.7=Root.Config.0.Settings.7

-Settings.0.8=Root.Config.0.Settings.8

-

-[Root.Config.1]

-Settings.1.0=Root.Config.1.Settings.0

-Settings.1.1=Root.Config.1.Settings.1

-Settings.1.2=Root.Config.1.Settings.2

-Settings.1.3=Root.Config.1.Settings.3

-Settings.1.4=Root.Config.1.Settings.4

-Settings.1.5=Root.Config.1.Settings.5

-Settings.1.6=Root.Config.1.Settings.6

-Settings.1.7=Root.Config.1.Settings.7

-Settings.1.8=Root.Config.1.Settings.8

-

-[Root.Config.0.Settings.0]

-String.6.0=2010,6,3,15,59,36

-String.100.0=ST Assembler Linker

-String.100.1=ST7 Cosmic

-String.100.2=STM8 Cosmic

-String.100.3=ST7 Metrowerks V1.1

-String.100.4=Raisonance

-String.101.0=STM8 Cosmic

-String.102.0=C:\Programmi\COSMIC\CXSTM8_32K

-String.103.0=

-String.104.0=Hstm8

-String.105.0=Lib

-String.106.0=Debug

-String.107.0=$(ProjectSFile).elf

-Int.108=0

-

-[Root.Config.0.Settings.1]

-String.6.0=2010,5,25,14,45,56

-String.100.0=$(TargetFName)

-String.101.0=

-String.102.0=

-String.103.0=.\;..\..\..\..\os\kernel\src;..\..\..\..\os\kernel\include;..\..\..\..\os\ports\cosmic\stm8;..\..\..\..\boards\st_stm8s_discovery;..\..\..\..\os\hal\platforms\stm8s;..\..\..\..\os\hal\include;..\..\..\..\os\hal\src;..\..\..\test;..\demo;

-

-[Root.Config.0.Settings.2]

-String.2.0=

-String.6.0=2010,5,25,14,45,56

-String.100.0=STM8S105C6

-

-[Root.Config.0.Settings.3]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,26,17,30,51

-

-[Root.Config.0.Settings.4]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Config.0.Settings.5]

-String.2.0=Running Pre-Link step

-String.6.0=2010,5,25,14,45,56

-String.8.0=

-

-[Root.Config.0.Settings.6]

-String.2.0=Running Linker

-String.3.0=clnk $(ToolsetLibOpts) -o $(OutputPath)$(TargetSName).sm8 -fakeInteger -fakeOutFile$(ProjectSFile).elf -fakeRunConv -fakeStartupcrtsi0.sm8 -fakeSemiAutoGen -fakeVectFilevectors.c -fakeVectAddr0x8000 -customMapFile -customMapFile-m$(OutputPath)$(TargetSName).map -customMapAddress -customCfgFile$(OutputPath)$(TargetSName).lkf 

-String.3.1=cvdwarf $(OutputPath)$(TargetSName).sm8

-String.4.0=$(OutputPath)$(TargetFName)

-String.5.0=

-String.6.0=2010,6,4,10,29,4

-String.100.0=

-String.101.0=crtsi.st7

-String.102.0=+seg .const -b 0x8080 -m 0x7f80 -n .const -it

-String.102.1=+seg .text -a .const -n .text

-String.102.2=+seg .eeprom -b 0x4000 -m 0x400 -n .eeprom

-String.102.3=+seg .bsct -b 0x0 -m 0x100 -n .bsct

-String.102.4=+seg .ubsct -a .bsct -n .ubsct

-String.102.5=+seg .bit -a .ubsct -n .bit -id

-String.102.6=+seg .share -a .bit -n .share -is

-String.102.7=+seg .data -b 0x100 -m 0x700 -n .data

-String.102.8=+seg .bss -a .data -n .bss

-String.103.0=Code,Constants[0x8080-0xffff]=.const,.text

-String.103.1=Eeprom[0x4000-0x43ff]=.eeprom

-String.103.2=Zero Page[0x0-0xff]=.bsct,.ubsct,.bit,.share

-String.103.3=Ram[0x100-0x7ff]=.data,.bss

-String.104.0=0x7ff

-String.105.0=libisl0.sm8;libm0.sm8

-Int.0=0

-Int.1=0

-

-[Root.Config.0.Settings.7]

-String.2.0=Running Post-Build step

-String.3.0=chex -o $(OutputPath)$(TargetSName).s19 $(OutputPath)$(TargetSName).sm8

-String.6.0=2010,5,25,14,45,56

-

-[Root.Config.0.Settings.8]

-String.2.0=Performing Custom Build on $(InputFile)

-String.6.0=2010,5,25,14,45,56

-

-[Root.Config.1.Settings.0]

-String.6.0=2010,6,3,15,59,36

-String.100.0=ST Assembler Linker

-String.100.1=ST7 Cosmic

-String.100.2=STM8 Cosmic

-String.100.3=ST7 Metrowerks V1.1

-String.100.4=Raisonance

-String.101.0=STM8 Cosmic

-String.102.0=C:\Programmi\COSMIC\CXSTM8_32K

-String.103.0=

-String.104.0=Hstm8

-String.105.0=Lib

-String.106.0=Release

-String.107.0=$(ProjectSFile).elf

-Int.108=0

-

-[Root.Config.1.Settings.1]

-String.6.0=2010,5,25,14,45,56

-String.100.0=$(TargetFName)

-String.101.0=

-String.102.0=

-String.103.0=.\;..\..\..\..\os\kernel\src;..\..\..\..\os\kernel\include;..\..\..\..\os\ports\cosmic\stm8;..\..\..\..\boards\st_stm8s_discovery;..\..\..\..\os\hal\platforms\stm8s;..\..\..\..\os\hal\include;..\..\..\..\os\hal\src;..\..\..\test;..\demo;

-

-[Root.Config.1.Settings.2]

-String.2.0=

-String.6.0=2010,5,25,14,45,56

-String.100.0=STM8S105C6

-

-[Root.Config.1.Settings.3]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Config.1.Settings.4]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Config.1.Settings.5]

-String.2.0=Running Pre-Link step

-String.6.0=2010,5,25,14,45,56

-String.8.0=

-

-[Root.Config.1.Settings.6]

-String.2.0=Running Linker

-String.3.0=clnk $(ToolsetLibOpts) -o $(OutputPath)$(TargetSName).sm8 -fakeInteger -fakeOutFile$(ProjectSFile).elf -fakeRunConv -fakeStartupcrtsi0.sm8 -fakeSemiAutoGen -fakeVectFilevectors.c -fakeVectAddr0x8000 -customMapFile -customMapFile-m$(OutputPath)$(TargetSName).map -customMapAddress -customCfgFile$(OutputPath)$(TargetSName).lkf 

-String.3.1=cvdwarf $(OutputPath)$(TargetSName).sm8

-String.4.0=$(OutputPath)$(TargetFName)

-String.5.0=

-String.6.0=2010,6,5,11,53,48

-String.100.0=

-String.101.0=crtsi.st7

-String.102.0=+seg .const -b 0x8080 -m 0x7f80 -n .const -it

-String.102.1=+seg .text -a .const -n .text

-String.102.2=+seg .eeprom -b 0x4000 -m 0x400 -n .eeprom

-String.102.3=+seg .bsct -b 0x0 -m 0x100 -n .bsct

-String.102.4=+seg .ubsct -a .bsct -n .ubsct

-String.102.5=+seg .bit -a .ubsct -n .bit -id

-String.102.6=+seg .share -a .bit -n .share -is

-String.102.7=+seg .data -b 0x100 -m 0x700 -n .data

-String.102.8=+seg .bss -a .data -n .bss

-String.103.0=Code,Constants[0x8080-0xffff]=.const,.text

-String.103.1=Eeprom[0x4000-0x43ff]=.eeprom

-String.103.2=Zero Page[0x0-0xff]=.bsct,.ubsct,.bit,.share

-String.103.3=Ram[0x100-0x7ff]=.data,.bss

-String.104.0=0x7ff

-String.105.0=libisl0.sm8;libm0.sm8

-Int.0=0

-Int.1=0

-

-[Root.Config.1.Settings.7]

-String.2.0=Running Post-Build step

-String.3.0=chex -o $(OutputPath)$(TargetSName).s19 $(OutputPath)$(TargetSName).sm8

-String.6.0=2010,5,25,14,45,56

-

-[Root.Config.1.Settings.8]

-String.2.0=Performing Custom Build on $(InputFile)

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files]

-ElemType=Folder

-PathName=Source Files

-Child=Root.Source Files...\demo\main.c

-Next=Root.Include Files

-Config.0=Root.Source Files.Config.0

-Config.1=Root.Source Files.Config.1

-

-[Root.Source Files.Config.0]

-Settings.0.0=Root.Source Files.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Config.0.Settings.3

-

-[Root.Source Files.Config.1]

-Settings.1.0=Root.Source Files.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Config.1.Settings.3

-

-[Root.Source Files.Config.0.Settings.0]

-String.6.0=2010,5,25,14,45,56

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Config.1.Settings.0]

-String.6.0=2010,5,25,14,45,56

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Source Files.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files...\demo\main.c]

-ElemType=File

-PathName=..\demo\main.c

-Next=Root.Source Files.vectors.c

-

-[Root.Source Files.vectors.c]

-ElemType=File

-PathName=vectors.c

-Next=Root.Source Files.Source Files\board

-

-[Root.Source Files.Source Files\board]

-ElemType=Folder

-PathName=Source Files\board

-Child=Root.Source Files.Source Files\board...\..\..\..\boards\st_stm8s_discovery\board.c

-Next=Root.Source Files.Source Files\os

-Config.0=Root.Source Files.Source Files\board.Config.0

-Config.1=Root.Source Files.Source Files\board.Config.1

-

-[Root.Source Files.Source Files\board.Config.0]

-Settings.0.0=Root.Source Files.Source Files\board.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\board.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\board.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\board.Config.0.Settings.3

-

-[Root.Source Files.Source Files\board.Config.1]

-Settings.1.0=Root.Source Files.Source Files\board.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\board.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\board.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\board.Config.1.Settings.3

-

-[Root.Source Files.Source Files\board.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\board.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\board.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\board.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\board.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\board.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\board.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Source Files.Source Files\board.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\board...\..\..\..\boards\st_stm8s_discovery\board.c]

-ElemType=File

-PathName=..\..\..\..\boards\st_stm8s_discovery\board.c

-

-[Root.Source Files.Source Files\os]

-ElemType=Folder

-PathName=Source Files\os

-Child=Root.Source Files.Source Files\os.Source Files\os\hal

-

-[Root.Source Files.Source Files\os.Source Files\os\hal]

-ElemType=Folder

-PathName=Source Files\os\hal

-Child=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\adc.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel

-Config.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\adc.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\adc.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\can.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\can.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\can.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\hal.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\hal.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\hal.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mac.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mac.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\mac.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mmc_spi.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mmc_spi.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\mmc_spi.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pal.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pal.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\pal.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pwm.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pwm.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\pwm.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\serial.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\serial.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\serial.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\spi.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\spi.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\spi.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s]

-ElemType=Folder

-PathName=Source Files\os\hal\stm8s

-Child=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\spi_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\hal_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\pal_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\serial_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel]

-ElemType=Folder

-PathName=Source Files\os\kernel

-Child=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c

-Next=Root.Source Files.Source Files\os.Source Files\os\port

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chcond.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chdebug.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdynamic.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdynamic.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chdynamic.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chevents.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chheap.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.0]

-String.6.0=2010,6,3,11,20,12

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +mods0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,54,38

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.0]

-String.6.0=2010,6,3,11,20,12

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +mods0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chlists.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmboxes.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmemcore.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmempools.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmsg.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmtx.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chqueues.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chregistry.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,16

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chschd.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chsem.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chsys.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chthreads.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chvt.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.0]

-String.6.0=2010,6,2,17,48,49

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +mods0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,54,38

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.0]

-String.6.0=2010,6,2,17,48,49

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +mods0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\port]

-ElemType=Folder

-PathName=Source Files\os\port

-Child=Root.Source Files.Source Files\os.Source Files\os\port...\..\..\..\os\ports\cosmic\stm8\chcore.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.0]

-String.6.0=2010,6,3,14,55,17

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Source Files.Source Files\os.Source Files\os\port...\..\..\..\os\ports\cosmic\stm8\chcore.c]

-ElemType=File

-PathName=..\..\..\..\os\ports\cosmic\stm8\chcore.c

-

-[Root.Include Files]

-ElemType=Folder

-PathName=Include Files

-Child=Root.Include Files...\demo\halconf.h

-Config.0=Root.Include Files.Config.0

-Config.1=Root.Include Files.Config.1

-

-[Root.Include Files.Config.0]

-Settings.0.0=Root.Include Files.Config.0.Settings.0

-Settings.0.1=Root.Include Files.Config.0.Settings.1

-Settings.0.2=Root.Include Files.Config.0.Settings.2

-Settings.0.3=Root.Include Files.Config.0.Settings.3

-

-[Root.Include Files.Config.1]

-Settings.1.0=Root.Include Files.Config.1.Settings.0

-Settings.1.1=Root.Include Files.Config.1.Settings.1

-Settings.1.2=Root.Include Files.Config.1.Settings.2

-Settings.1.3=Root.Include Files.Config.1.Settings.3

-

-[Root.Include Files.Config.0.Settings.0]

-String.6.0=2010,5,25,14,45,56

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Include Files.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +warn +modsl0 -customDebCompat -customOpt-no -customC-pp -customLst -l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Include Files.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -xx -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,5,25,14,45,56

-

-[Root.Include Files.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Include Files.Config.1.Settings.0]

-String.6.0=2010,5,25,14,45,56

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Include Files.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=cxstm8 +modsl0 -customC-pp -customLst-l -i..\demo -i..\..\..\test -i..\..\..\..\os\hal\include -i..\..\..\..\os\hal\platforms\stm8s -i..\..\..\..\boards\st_stm8s_discovery -i..\..\..\..\os\ports\cosmic\stm8 -i..\..\..\..\os\kernel\include $(ToolsetIncOpts) -cl$(IntermPath) -co$(IntermPath) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,5,11,53,48

-

-[Root.Include Files.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=castm8 -l $(ToolsetIncOpts) -o$(IntermPath)$(InputName).$(ObjectExt) $(InputFile)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).ls

-String.6.0=2010,6,2,8,54,4

-

-[Root.Include Files.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,5,25,14,45,56

-

-[Root.Include Files...\demo\halconf.h]

-ElemType=File

-PathName=..\demo\halconf.h

-Next=Root.Include Files...\demo\chconf.h

-

-[Root.Include Files...\demo\chconf.h]

-ElemType=File

-PathName=..\demo\chconf.h

-Next=Root.Include Files...\demo\mcuconf.h

-

-[Root.Include Files...\demo\mcuconf.h]

-ElemType=File

-PathName=..\demo\mcuconf.h

-Next=Root.Include Files.Include Files\board

-

-[Root.Include Files.Include Files\board]

-ElemType=Folder

-PathName=Include Files\board

-Child=Root.Include Files.Include Files\board...\..\..\..\boards\st_stm8s_discovery\board.h

-Next=Root.Include Files.Include Files\os

-

-[Root.Include Files.Include Files\board...\..\..\..\boards\st_stm8s_discovery\board.h]

-ElemType=File

-PathName=..\..\..\..\boards\st_stm8s_discovery\board.h

-

-[Root.Include Files.Include Files\os]

-ElemType=Folder

-PathName=Include Files\os

-Child=Root.Include Files.Include Files\os.Include Files\os\hal

-Next=Root.Include Files.Include Files\test

-

-[Root.Include Files.Include Files\os.Include Files\os\hal]

-ElemType=Folder

-PathName=Include Files\os\hal

-Child=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\adc.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\adc.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\adc.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\can.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\can.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\can.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\hal.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\hal.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\hal.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mac.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mac.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mac.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mii.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mii.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mii.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mmc_spi.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mmc_spi.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mmc_spi.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pal.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pal.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\pal.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pwm.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pwm.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\pwm.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\serial.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\serial.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\serial.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\spi.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\spi.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\spi.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s]

-ElemType=Folder

-PathName=Include Files\os\hal\stm8s

-Child=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\spi_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\hal_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\pal_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\serial_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\stm8s.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s_type.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s_type.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\stm8s_type.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel]

-ElemType=Folder

-PathName=Include Files\os\kernel

-Child=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\ch.h

-Next=Root.Include Files.Include Files\os.Include Files\os\port

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\ch.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\ch.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chcond.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chcond.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chcond.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdebug.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdebug.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chdebug.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdynamic.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdynamic.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chdynamic.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chevents.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chevents.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chevents.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chheap.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chheap.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chheap.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chinline.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chinline.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chinline.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chioch.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chioch.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chioch.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chlists.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chlists.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chlists.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmboxes.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmboxes.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmboxes.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmemcore.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmemcore.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmemcore.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmempools.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmempools.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmempools.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmsg.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmsg.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmsg.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmtx.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmtx.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmtx.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chqueues.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chqueues.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chqueues.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chregistry.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chregistry.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chregistry.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chschd.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chschd.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chschd.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsem.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsem.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chsem.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chstreams.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chstreams.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chstreams.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsys.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsys.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chsys.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chthreads.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chthreads.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chthreads.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chvt.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chvt.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chvt.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port]

-ElemType=Folder

-PathName=Include Files\os\port

-Child=Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\cosmic\stm8\chcore.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\cosmic\stm8\chcore.h]

-ElemType=File

-PathName=..\..\..\..\os\ports\cosmic\stm8\chcore.h

-Next=Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\cosmic\stm8\chtypes.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\cosmic\stm8\chtypes.h]

-ElemType=File

-PathName=..\..\..\..\os\ports\cosmic\stm8\chtypes.h

-

-[Root.Include Files.Include Files\test]

-ElemType=Folder

-PathName=Include Files\test
\ No newline at end of file
diff --git a/testhal/STM8S/SPI/cosmic/vectors.c b/testhal/STM8S/SPI/cosmic/vectors.c
deleted file mode 100644
index b6b57dc1d..000000000
--- a/testhal/STM8S/SPI/cosmic/vectors.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/**

- * @brief   Exception handler type.

- */

-typedef void @far @interrupt (*interrupt_handler_t)(void);

-

-/*

- * Various external symbols.

- */

-void _stext(void);

-@far @interrupt void vector10(void);

-@far @interrupt void vector13(void);

-@far @interrupt void vector17(void);

-@far @interrupt void vector18(void);

-@far @interrupt void vector20(void);

-@far @interrupt void vector21(void);

-

-/**

- * @brief   Exception vector type.

- */

-typedef struct {

-  uint8_t               ev_instruction;

-  interrupt_handler_t   ev_handler;

-} exception_vector_t;

-

-/**

- * @brief   Undefined interrupt handler.

- * @note    It should never be invoked.

- */

-@far @interrupt static void vector (void)

-{

-  return;

-}

-

-/**

- * @brief   Exceptions table.

- */

-exception_vector_t const _vectab[] = {

-  {0x82, (interrupt_handler_t)_stext},        /* reset */

-  {0x82, vector},                             /* trap  */

-  {0x82, vector},                             /* vector0  */

-  {0x82, vector},                             /* vector1  */

-  {0x82, vector},                             /* vector2  */

-  {0x82, vector},                             /* vector3  */

-  {0x82, vector},                             /* vector4  */

-  {0x82, vector},                             /* vector5  */

-  {0x82, vector},                             /* vector6  */

-  {0x82, vector},                             /* vector7  */

-  {0x82, vector},                             /* vector8  */

-  {0x82, vector},                             /* vector9  */

-#if HAL_USE_SPI && STM8S_SPI_USE_SPI

-  {0x82, vector10},

-#else

-  {0x82, vector},                             /* vector10 */

-#endif

-  {0x82, vector},                             /* vector11 */

-  {0x82, vector},                             /* vector12 */

-  {0x82, vector13},                           /* vector13 */

-  {0x82, vector},                             /* vector14 */

-  {0x82, vector},                             /* vector15 */

-  {0x82, vector},                             /* vector16 */

-#if HAL_USE_SERIAL && STM8S_SERIAL_USE_UART1

-  {0x82, vector17},                           /* vector17 */

-  {0x82, vector18},                           /* vector18 */

-#else

-  {0x82, vector},                             /* vector17 */

-  {0x82, vector},                             /* vector18 */

-#endif

-  {0x82, vector},                             /* vector19 */

-#if HAL_USE_SERIAL && (STM8S_SERIAL_USE_UART2 || STM8S_SERIAL_USE_UART3)

-  {0x82, vector20},                           /* vector20 */

-  {0x82, vector21},                           /* vector21 */

-#else

-  {0x82, vector},                             /* vector20 */

-  {0x82, vector},                             /* vector21 */

-#endif

-  {0x82, vector},                             /* vector22 */

-  {0x82, vector},                             /* vector23 */

-  {0x82, vector},                             /* vector24 */

-  {0x82, vector},                             /* vector25 */

-  {0x82, vector},                             /* vector26 */

-  {0x82, vector},                             /* vector27 */

-  {0x82, vector},                             /* vector28 */

-  {0x82, vector},                             /* vector29 */

-};

diff --git a/testhal/STM8S/SPI/demo/chconf.h b/testhal/STM8S/SPI/demo/chconf.h
deleted file mode 100644
index f943ea80c..000000000
--- a/testhal/STM8S/SPI/demo/chconf.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/chconf.h

- * @brief   Configuration file template.

- * @details A copy of this file must be placed in each project directory, it

- *          contains the application specific kernel settings.

- *

- * @addtogroup config

- * @details Kernel related settings and hooks.

- * @{

- */

-

-#ifndef _CHCONF_H_

-#define _CHCONF_H_

-

-/*===========================================================================*/

-/**

- * @name Kernel parameters and options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_FREQUENCY                    1000

-#endif

-

-/**

- * @brief   Round robin interval.

- * @details This constant is the number of system ticks allowed for the

- *          threads before preemption occurs. Setting this value to zero

- *          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.

- */

-#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Managed RAM size.

- * @details Size of the RAM area to be managed by the OS. If set to zero

- *          then the whole available RAM is used. The core memory is made

- *          available to the heap allocator and/or can be used directly through

- *          the simplified core memory allocator.

- *

- * @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.

- */

-#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

-#define CH_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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Performance options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   OS optimization.

- * @details If enabled then time efficient rather than space efficient code

- *          is used when two possible implementations exist.

- *

- * @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

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Subsystem options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @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

-#endif

-

-/**

- * @brief   Threads synchronization APIs.

- * @details If enabled then the @p chThdWait() function is included in

- *          the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__)

-#define CH_USE_WAITEXIT                 TRUE

-#endif

-

-/**

- * @brief   Semaphores APIs.

- * @details If enabled then the Semaphores APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__)

-#define CH_USE_SEMAPHORES               TRUE

-#endif

-

-/**

- * @brief   Semaphores queuing mode.

- * @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.

- */

-#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__)

-#define CH_USE_SEMSW                    TRUE

-#endif

-

-/**

- * @brief   Mutexes APIs.

- * @details If enabled then the mutexes APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__)

-#define CH_USE_MUTEXES                  TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs.

- * @details If enabled then the conditional variables APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_MUTEXES.

- */

-#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS                 TRUE

-#endif

-

-/**

- * @brief   Conditional Variables APIs with timeout.

- * @details If enabled then the conditional variables APIs with timeout

- *          specification are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_CONDVARS.

- */

-#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_CONDVARS_TIMEOUT         TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs.

- * @details If enabled then the event flags APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS                   TRUE

-#endif

-

-/**

- * @brief   Events Flags APIs with timeout.

- * @details If enabled then the events APIs with timeout specification

- *          are included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_EVENTS.

- */

-#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages APIs.

- * @details If enabled then the synchronous messages APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES                 TRUE

-#endif

-

-/**

- * @brief   Synchronous Messages queuing mode.

- * @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.

- */

-#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__)

-#define CH_USE_MESSAGES_PRIORITY        FALSE

-#endif

-

-/**

- * @brief   Mailboxes APIs.

- * @details If enabled then the asynchronous messages (mailboxes) APIs are

- *          included in the kernel.

- *

- * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

- */

-#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__)

-#define CH_USE_MAILBOXES                TRUE

-#endif

-

-/**

- * @brief   I/O Queues APIs.

- * @details If enabled then the I/O queues APIs are included in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

-#define CH_USE_QUEUES                   TRUE

-#endif

-

-/**

- * @brief   Core Memory Manager APIs.

- * @details If enabled then the core memory manager APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__)

-#define CH_USE_MEMCORE                  TRUE

-#endif

-

-/**

- * @brief   Heap Allocator APIs.

- * @details If enabled then the memory heap allocator APIs are included

- *          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    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

-#endif

-

-/**

- * @brief   Memory Pools Allocator APIs.

- * @details If enabled then the memory pools allocator APIs are included

- *          in the kernel.

- *

- * @note    The default is @p TRUE.

- */

-#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__)

-#define CH_USE_MEMPOOLS                 TRUE

-#endif

-

-/**

- * @brief   Dynamic Threads APIs.

- * @details If enabled then the dynamic threads creation APIs are included

- *          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.

- */

-#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)

-#define CH_USE_DYNAMIC                  TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Debug options

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Debug option, system state check.

- * @details If enabled the correct call protocol for system APIs is checked

- *          at runtime.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

-#define CH_DBG_SYSTEM_STATE_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, parameters checks.

- * @details If enabled then the checks on the API functions input

- *          parameters are activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_CHECKS            FALSE

-#endif

-

-/**

- * @brief   Debug option, consistency checks.

- * @details If enabled then all the assertions in the kernel code are

- *          activated. This includes consistency checks inside the kernel,

- *          runtime anomalies and port-defined checks.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_ASSERTS           FALSE

-#endif

-

-/**

- * @brief   Debug option, trace buffer.

- * @details If enabled then the context switch circular trace buffer is

- *          activated.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             FALSE

-#endif

-

-/**

- * @brief   Debug option, stack checks.

- * @details If enabled then a runtime stack check is performed.

- *

- * @note    The default is @p FALSE.

- * @note    The stack check is performed in a architecture/port dependent way.

- *          It may not be implemented or some ports.

- * @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) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_STACK_CHECK       FALSE

-#endif

-

-/**

- * @brief   Debug option, stacks initialization.

- * @details If enabled then the threads working area is filled with a byte

- *          value when a thread is created. This can be useful for the

- *          runtime measurement of the used stack.

- *

- * @note    The default is @p FALSE.

- */

-#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)

-#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

- *          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.

- */

-#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        TRUE

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/**

- * @name Kernel hooks

- * @{

- */

-/*===========================================================================*/

-

-/**

- * @brief   Threads descriptor structure extension.

- * @details User fields added to the end of the @p Thread structure.

- */

-#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__)

-#define THREAD_EXT_FIELDS                                                   \

-  /* Add threads custom fields here.*/

-#endif

-

-/**

- * @brief   Threads initialization hook.

- * @details User initialization code added to the @p chThdInit() API.

- *

- * @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) {                                          \

-  /* Add threads initialization code here.*/                                \

-}

-#endif

-

-/**

- * @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.

- */

-#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__)

-#define THREAD_EXT_EXIT_HOOK(tp) {                                          \

-  /* Add threads finalization code here.*/                                  \

-}

-#endif

-

-/**

- * @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) {                              \

-  /* System halt code here.*/                                               \

-}

-#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() {                                                  \

-  /* Idle loop code here.*/                                                 \

-}

-#endif

-

-/**

- * @brief   System tick event hook.

- * @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() {                                          \

-  /* System tick event code here.*/                                         \

-}

-#endif

-

-/**

- * @brief   System halt hook.

- * @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() {                                                \

-  /* System halt code here.*/                                               \

-}

-#endif

-

-/** @} */

-

-/*===========================================================================*/

-/* Port-specific settings (override port settings defaulted in chcore.h).    */

-/*===========================================================================*/

-

-#endif  /* _CHCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM8S/SPI/demo/halconf.h b/testhal/STM8S/SPI/demo/halconf.h
deleted file mode 100644
index fdc079aef..000000000
--- a/testhal/STM8S/SPI/demo/halconf.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file    templates/halconf.h

- * @brief   HAL configuration header.

- * @details HAL configuration file, this file allows to enable or disable the

- *          various device drivers from your application. You may also use

- *          this file in order to override the device drivers default settings.

- *

- * @addtogroup HAL_CONF

- * @{

- */

-

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

-

-#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__)

-#define HAL_USE_PAL                 TRUE

-#endif

-

-/**

- * @brief   Enables the ADC subsystem.

- */

-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 FALSE

-#endif

-

-/**

- * @brief   Enables the CAN subsystem.

- */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

-#endif

-

-/**

- * @brief   Enables the EXT subsystem.

- */

-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 FALSE

-#endif

-

-/**

- * @brief   Enables the GPT subsystem.

- */

-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)

-#define HAL_USE_GPT                 FALSE

-#endif

-

-/**

- * @brief   Enables the I2C subsystem.

- */

-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 FALSE

-#endif

-

-/**

- * @brief   Enables the ICU subsystem.

- */

-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)

-#define HAL_USE_ICU                 FALSE

-#endif

-

-/**

- * @brief   Enables the MAC subsystem.

- */

-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)

-#define HAL_USE_MAC                 FALSE

-#endif

-

-/**

- * @brief   Enables the MMC_SPI subsystem.

- */

-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_MMC_SPI             FALSE

-#endif

-

-/**

- * @brief   Enables the PWM subsystem.

- */

-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SDC subsystem.

- */

-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

-#define HAL_USE_SDC                 FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL subsystem.

- */

-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL              FALSE

-#endif

-

-/**

- * @brief   Enables the SERIAL over USB subsystem.

- */

-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

-#endif

-

-/**

- * @brief   Enables the SPI subsystem.

- */

-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

-#endif

-

-/**

- * @brief   Enables the UART subsystem.

- */

-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)

-#define HAL_USE_UART                FALSE

-#endif

-

-/**

- * @brief   Enables the USB subsystem.

- */

-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

-#endif

-

-/*===========================================================================*/

-/* ADC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)

-#define ADC_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* CAN driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Sleep mode related APIs inclusion switch.

- */

-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)

-#define CAN_USE_SLEEP_MODE          TRUE

-#endif

-

-/*===========================================================================*/

-/* I2C driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables the mutual exclusion APIs on the I2C bus.

- */

-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-/*===========================================================================*/

-/* MAC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)

-#define MAC_USE_ZERO_COPY           FALSE

-#endif

-

-/**

- * @brief   Enables an event sources for incoming packets.

- */

-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

-#define MAC_USE_EVENTS              TRUE

-#endif

-

-/*===========================================================================*/

-/* MMC_SPI driver related settings.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- *          This option is recommended also if the SPI driver does not

- *          use a DMA channel and heavily loads the CPU.

- */

-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)

-#define MMC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SDC driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Number of initialization attempts before rejecting the card.

- * @note    Attempts are performed at 10mS intervals.

- */

-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)

-#define SDC_INIT_RETRY              100

-#endif

-

-/**

- * @brief   Include support for MMC cards.

- * @note    MMC support is not yet implemented so this option must be kept

- *          at @p FALSE.

- */

-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)

-#define SDC_MMC_SUPPORT             FALSE

-#endif

-

-/**

- * @brief   Delays insertions.

- * @details If enabled this options inserts delays into the MMC waiting

- *          routines releasing some extra CPU time for the threads with

- *          lower priority, this may slow down the driver a bit however.

- */

-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)

-#define SDC_NICE_WAITING            TRUE

-#endif

-

-/*===========================================================================*/

-/* SERIAL driver related settings.                                           */

-/*===========================================================================*/

-

-/**

- * @brief   Default bit rate.

- * @details Configuration parameter, this is the baud rate selected for the

- *          default configuration.

- */

-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      38400

-#endif

-

-/**

- * @brief   Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

- *          buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         16

-#endif

-

-/*===========================================================================*/

-/* SPI driver related settings.                                              */

-/*===========================================================================*/

-

-/**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)

-#define SPI_USE_WAIT                TRUE

-#endif

-

-/**

- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    TRUE

-#endif

-

-#endif /* _HALCONF_H_ */

-

-/** @} */

diff --git a/testhal/STM8S/SPI/demo/main.c b/testhal/STM8S/SPI/demo/main.c
deleted file mode 100644
index b1e8b6ed1..000000000
--- a/testhal/STM8S/SPI/demo/main.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-/*

- * SPI configuration (8MHz, CPHA=0, CPOL=0, MSb first).

- */

-static ROMCONST SPIConfig spicfg = {

-  NULL,

-  GPIOD,

-  PD_LD10,

-  0

-};

-

-/*

- * Transmit data.

- */

-static ROMCONST uint8_t digits[32] = {

-  0x24, 0xAF, 0xE0, 0xA2, 0x2B, 0x32, 0x30, 0xA7,

-  0x20, 0x22, 0x21, 0x38, 0x74, 0xA8, 0x70, 0x71,

-  0x04, 0x8F, 0xC0, 0x82, 0x0B, 0x12, 0x10, 0x87,

-  0x00, 0x02, 0x01, 0x18, 0x54, 0x88, 0x50, 0x51

-};

-

-/*

- * Receive buffer.

- */

-static uint8_t buffer[32];

-

-/*

- * Application entry point.

- */

-void main(void) {

-

-  /*

-   * System initializations.

-   * - HAL initialization, this also initializes the configured device drivers

-   *   and performs the board-specific initializations.

-   * - Kernel initialization, the main() function becomes a thread and the

-   *   RTOS is active.

-   */

-  halInit();

-  chSysInit();

-

-  /*

-   * OS initialization.

-   */

-  chSysInit();

-

-  /*

-   * Activates the SPI driver 1 using the driver default configuration.

-   */

-  spiStart(&SPID1, &spicfg);

-

-  /*

-   * Normal main() thread activity.

-   */

-  while (TRUE) {

-    volatile uint8_t b;

-

-    chThdSleepMilliseconds(1000);

-    /* Exchanging data, if the pins MISO and MOSI are connected then the

-       transmitted data is received back into the buffer. On the

-       STM8S-Discovery board the pins are CN2-9 and CN2-10.*/

-    spiSelect(&SPID1);

-    spiExchange(&SPID1, sizeof(digits), digits, buffer);

-    /* Polled transfers test.*/

-    b = spiPolledExchange(&SPID1, 0x55);    

-    b = spiPolledExchange(&SPID1, 0xAA);    

-    spiUnselect(&SPID1);

-  }

-}

diff --git a/testhal/STM8S/SPI/demo/mcuconf.h b/testhal/STM8S/SPI/demo/mcuconf.h
deleted file mode 100644
index c09874c9b..000000000
--- a/testhal/STM8S/SPI/demo/mcuconf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * STM8 drivers configuration.

- * The following settings override the default settings present in

- * the various device driver implementation headers.

- * Note that the settings for each driver only have effect if the driver

- * is enabled in halconf.h.

- */

-

-/*

- * HAL general settings.

- */

-#define STM8S_NO_CLOCK_INIT             FALSE

-#define STM8S_HSI_ENABLED               FALSE

-#define STM8S_LSI_ENABLED               TRUE

-#define STM8S_HSE_ENABLED               TRUE

-#define STM8S_SYSCLK_SOURCE             CLK_SYSSEL_HSE

-#define STM8S_HSI_DIVIDER               CLK_HSI_DIV1

-#define STM8S_CPU_DIVIDER               CLK_CPU_DIV1

-

-/*

- * SERIAL driver system settings.

- */

-#define STM8S_SERIAL_USE_UART1          FALSE

-#define STM8S_SERIAL_USE_UART2          TRUE

-#define STM8S_SERIAL_USE_UART3          FALSE

-

-/*

- * SPI driver system settings.

- */

-#define STM8S_SPI_USE_SPI               TRUE

-#define STM8S_SPI_ERROR_HOOK(spip)      chSysHalt()

diff --git a/testhal/STM8S/SPI/raisonance/raisonance.stp b/testhal/STM8S/SPI/raisonance/raisonance.stp
deleted file mode 100644
index d9e65a4e0..000000000
--- a/testhal/STM8S/SPI/raisonance/raisonance.stp
+++ /dev/null
@@ -1,1963 +0,0 @@
-;	STMicroelectronics Project file

-

-[Version]

-Keyword=ST7Project

-Number=1.3

-

-[Project]

-Name=raisonance

-Toolset=Raisonance

-

-[Config]

-0=Config.0

-1=Config.1

-

-[Config.0]

-ConfigName=Debug

-Target=$(ProjectSFile).elf

-OutputFolder=Debug

-Debug=$(TargetFName)

-

-[Config.1]

-ConfigName=Release

-Target=$(ProjectSFile).elf

-OutputFolder=Release

-Debug=$(TargetFName)

-

-[Root]

-ElemType=Project

-PathName=raisonance

-Child=Root.Source Files

-Config.0=Root.Config.0

-Config.1=Root.Config.1

-

-[Root.Config.0]

-Settings.0.0=Root.Config.0.Settings.0

-Settings.0.1=Root.Config.0.Settings.1

-Settings.0.2=Root.Config.0.Settings.2

-Settings.0.3=Root.Config.0.Settings.3

-Settings.0.4=Root.Config.0.Settings.4

-Settings.0.5=Root.Config.0.Settings.5

-Settings.0.6=Root.Config.0.Settings.6

-Settings.0.7=Root.Config.0.Settings.7

-Settings.0.8=Root.Config.0.Settings.8

-

-[Root.Config.1]

-Settings.1.0=Root.Config.1.Settings.0

-Settings.1.1=Root.Config.1.Settings.1

-Settings.1.2=Root.Config.1.Settings.2

-Settings.1.3=Root.Config.1.Settings.3

-Settings.1.4=Root.Config.1.Settings.4

-Settings.1.5=Root.Config.1.Settings.5

-Settings.1.6=Root.Config.1.Settings.6

-Settings.1.7=Root.Config.1.Settings.7

-Settings.1.8=Root.Config.1.Settings.8

-

-[Root.Config.0.Settings.0]

-String.6.0=2010,6,4,10,30,46

-String.100.0=ST Assembler Linker

-String.100.1=ST7 Cosmic

-String.100.2=STM8 Cosmic

-String.100.3=ST7 Metrowerks V1.1

-String.100.4=Raisonance

-String.101.0=Raisonance

-String.102.0=C:\Programmi\Raisonance\Ride

-String.103.0=bin

-String.104.0=INC\ST7;INC

-String.105.0=LIB\ST7

-String.106.0=Debug

-String.107.0=$(ProjectSFile).elf

-Int.108=0

-

-[Root.Config.0.Settings.1]

-String.6.0=2010,6,4,10,10,40

-String.100.0=$(TargetFName)

-String.101.0=

-String.102.0=

-String.103.0=.\;..\demo;..\..\..\..\boards\st_stm8s_discovery;..\..\..\..\os\kernel\src;..\..\..\..\os\kernel\include;..\..\..\..\os\hal\include;..\..\..\..\os\hal\platforms\stm8s;..\..\..\..\os\hal\src;..\..\..\test;..\..\..\..\os\ports\rc\stm8;

-

-[Root.Config.0.Settings.2]

-String.2.0=

-String.6.0=2010,6,4,10,10,40

-String.100.0=STM8S105C6

-

-[Root.Config.0.Settings.3]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Config.0.Settings.4]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Config.0.Settings.5]

-String.2.0=Running Pre-Link step

-String.6.0=2010,6,4,10,10,40

-String.8.0=

-

-[Root.Config.0.Settings.6]

-String.2.0=Running Linker

-String.3.0=rlstm8 -P $(ObjectFiles) TO($(OutputPath)$(TargetSName).aof) $(ToolsetLibOpts) -CustomOutFile[$(ProjectSFile).elf] DEBUGLINES DEBUGPUBLICS DEBUGSYMBOLS -CustomRunHexConv -customMapFile -customMapFilePR($(OutputPath)$(TargetSName).map) 

-String.3.1=omf2elf $(OutputPath)$(TargetSName).aof

-String.4.0=$(OutputPath)$(TargetFName)

-String.5.0=$(OutputPath)$(ProjectSFile).elf $(OutputPath)$(TargetSName).map

-String.6.0=2010,6,4,12,15,0

-String.100.0= DATASTART(0x0) RAMSIZE(0x800) CODESTART(0x8000) CODESIZE(0x8000) STACKTOP(0x800) STACKSIZE(0x100) EEPROMSTART(0x4000) EEPROMSIZE(0x400)

-String.101.0=

-String.102.0=

-Int.0=0

-Int.1=0

-

-[Root.Config.0.Settings.7]

-String.2.0=Running Post-Build step

-String.3.0=omf2hex $(OutputPath)$(TargetSName).aof HEX

-String.6.0=2010,6,4,10,10,40

-

-[Root.Config.0.Settings.8]

-String.2.0=Performing Custom Build on $(InputFile)

-String.6.0=2010,6,4,10,10,40

-

-[Root.Config.1.Settings.0]

-String.6.0=2010,6,4,11,25,50

-String.100.0=ST Assembler Linker

-String.100.1=ST7 Cosmic

-String.100.2=STM8 Cosmic

-String.100.3=ST7 Metrowerks V1.1

-String.100.4=Raisonance

-String.101.0=Raisonance

-String.102.0=C:\Programmi\Raisonance\Ride

-String.103.0=bin

-String.104.0=INC\ST7;INC

-String.105.0=LIB\ST7

-String.106.0=Release

-String.107.0=$(ProjectSFile).elf

-Int.108=0

-

-[Root.Config.1.Settings.1]

-String.6.0=2010,6,4,10,10,40

-String.100.0=$(TargetFName)

-String.101.0=

-String.102.0=

-String.103.0=.\;..\demo;..\..\..\..\boards\st_stm8s_discovery;..\..\..\..\os\kernel\src;..\..\..\..\os\kernel\include;..\..\..\..\os\hal\include;..\..\..\..\os\hal\platforms\stm8s;..\..\..\..\os\hal\src;..\..\..\test;..\..\..\..\os\ports\rc\stm8;

-

-[Root.Config.1.Settings.2]

-String.2.0=

-String.6.0=2010,6,4,10,10,40

-String.100.0=STM8S105C6

-

-[Root.Config.1.Settings.3]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Config.1.Settings.4]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Config.1.Settings.5]

-String.2.0=Running Pre-Link step

-String.6.0=2010,6,4,10,10,40

-String.8.0=

-

-[Root.Config.1.Settings.6]

-String.2.0=Running Linker

-String.3.0=rlstm8 -P $(ObjectFiles) TO($(OutputPath)$(TargetSName).aof) $(ToolsetLibOpts) -CustomOutFile[$(ProjectSFile).elf] NODEBUGLINES NODEBUGPUBLICS NODEBUGSYMBOLS -CustomRunHexConv -customMapFile -customMapFilePR($(OutputPath)$(TargetSName).map) 

-String.3.1=omf2elf $(OutputPath)$(TargetSName).aof

-String.4.0=$(OutputPath)$(TargetFName)

-String.5.0=$(OutputPath)$(ProjectSFile).elf $(OutputPath)$(TargetSName).map

-String.6.0=2010,6,4,12,15,0

-String.100.0= DATASTART(0x0) RAMSIZE(0x800) CODESTART(0x8000) CODESIZE(0x8000) STACKTOP(0x800) STACKSIZE(0x100) EEPROMSTART(0x4000) EEPROMSIZE(0x400)

-String.101.0=

-String.102.0=

-Int.0=0

-Int.1=0

-

-[Root.Config.1.Settings.7]

-String.2.0=Running Post-Build step

-String.3.0=omf2hex $(OutputPath)$(TargetSName).aof HEX

-String.6.0=2010,6,4,10,10,40

-

-[Root.Config.1.Settings.8]

-String.2.0=Performing Custom Build on $(InputFile)

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files]

-ElemType=Folder

-PathName=Source Files

-Child=Root.Source Files...\demo\main.c

-Next=Root.Include Files

-Config.0=Root.Source Files.Config.0

-Config.1=Root.Source Files.Config.1

-

-[Root.Source Files.Config.0]

-Settings.0.0=Root.Source Files.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Config.0.Settings.3

-

-[Root.Source Files.Config.1]

-Settings.1.0=Root.Source Files.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Config.1.Settings.3

-

-[Root.Source Files.Config.0.Settings.0]

-String.6.0=2010,6,4,10,10,40

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Source Files.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Source Files.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Config.1.Settings.0]

-String.6.0=2010,6,4,10,10,40

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files...\demo\main.c]

-ElemType=File

-PathName=..\demo\main.c

-Next=Root.Source Files.Source Files\board

-Config.0=Root.Source Files...\demo\main.c.Config.0

-Config.1=Root.Source Files...\demo\main.c.Config.1

-

-[Root.Source Files...\demo\main.c.Config.0]

-Settings.0.0=Root.Source Files...\demo\main.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files...\demo\main.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files...\demo\main.c.Config.0.Settings.2

-

-[Root.Source Files...\demo\main.c.Config.1]

-Settings.1.0=Root.Source Files...\demo\main.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files...\demo\main.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files...\demo\main.c.Config.1.Settings.2

-

-[Root.Source Files...\demo\main.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,12,31

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files...\demo\main.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files...\demo\main.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files...\demo\main.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,12,31

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files...\demo\main.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files...\demo\main.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\board]

-ElemType=Folder

-PathName=Source Files\board

-Child=Root.Source Files.Source Files\board...\..\..\..\boards\st_stm8s_discovery\board.c

-Next=Root.Source Files.Source Files\os

-Config.0=Root.Source Files.Source Files\board.Config.0

-Config.1=Root.Source Files.Source Files\board.Config.1

-

-[Root.Source Files.Source Files\board.Config.0]

-Settings.0.0=Root.Source Files.Source Files\board.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\board.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\board.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\board.Config.0.Settings.3

-

-[Root.Source Files.Source Files\board.Config.1]

-Settings.1.0=Root.Source Files.Source Files\board.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\board.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\board.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\board.Config.1.Settings.3

-

-[Root.Source Files.Source Files\board.Config.0.Settings.0]

-String.6.0=2010,6,4,10,11,42

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\board.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Source Files.Source Files\board.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Source Files.Source Files\board.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\board.Config.1.Settings.0]

-String.6.0=2010,6,4,10,11,42

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\board.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\board.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\board.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\board...\..\..\..\boards\st_stm8s_discovery\board.c]

-ElemType=File

-PathName=..\..\..\..\boards\st_stm8s_discovery\board.c

-

-[Root.Source Files.Source Files\os]

-ElemType=Folder

-PathName=Source Files\os

-Child=Root.Source Files.Source Files\os.Source Files\os\hal

-

-[Root.Source Files.Source Files\os.Source Files\os\hal]

-ElemType=Folder

-PathName=Source Files\os\hal

-Child=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\spi.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel

-Config.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.0]

-String.6.0=2010,6,4,10,13,32

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.0]

-String.6.0=2010,6,4,10,13,32

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\spi.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\spi.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\serial.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\serial.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\serial.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pwm.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pwm.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\pwm.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pal.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\pal.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\pal.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mmc_spi.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mmc_spi.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\mmc_spi.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mac.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\mac.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\mac.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\hal.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\hal.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\hal.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\can.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\can.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\can.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\adc.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal...\..\..\..\os\hal\src\adc.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\src\adc.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s]

-ElemType=Folder

-PathName=Source Files\os\hal\stm8s

-Child=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\spi_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\pal_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\hal_lld.c

-Next=Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\hal.Source Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.c]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\serial_lld.c

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel]

-ElemType=Folder

-PathName=Source Files\os\kernel

-Child=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c

-Next=Root.Source Files.Source Files\os.Source Files\os\port

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chvt.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,31

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(page0) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,31

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chvt.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(page0) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chthreads.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,31

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,31

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chthreads.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chsys.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsys.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chsem.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chsem.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chschd.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,30

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chschd.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chregistry.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,29

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,29

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chregistry.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chqueues.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,29

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,29

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chqueues.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmtx.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmtx.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmsg.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmsg.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmempools.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmempools.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmemcore.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,28

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmemcore.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chmboxes.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chmboxes.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chlists.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chlists.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chheap.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(page0) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chheap.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(page0) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chevents.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdynamic.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chevents.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdynamic.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chdynamic.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chdebug.c

-Next=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chdebug.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c]

-ElemType=File

-PathName=..\..\..\..\os\kernel\src\chcond.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.2

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.0.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-String.8.0=Debug

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.0]

-String.6.0=2010,6,4,10,14,27

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.1]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\kernel...\..\..\..\os\kernel\src\chcond.c.Config.1.Settings.2]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-String.8.0=Release

-

-[Root.Source Files.Source Files\os.Source Files\os\port]

-ElemType=Folder

-PathName=Source Files\os\port

-Child=Root.Source Files.Source Files\os.Source Files\os\port...\..\..\..\os\ports\rc\stm8\chcore.c

-Config.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.0

-Config.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.1

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0]

-Settings.0.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.0

-Settings.0.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.1

-Settings.0.2=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.2

-Settings.0.3=Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1]

-Settings.1.0=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.0

-Settings.1.1=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.1

-Settings.1.2=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.2

-Settings.1.3=Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.3

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.0]

-String.6.0=2010,6,4,10,13,43

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.0]

-String.6.0=2010,6,4,10,13,43

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Source Files.Source Files\os.Source Files\os\port.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Source Files.Source Files\os.Source Files\os\port...\..\..\..\os\ports\rc\stm8\chcore.c]

-ElemType=File

-PathName=..\..\..\..\os\ports\rc\stm8\chcore.c

-

-[Root.Include Files]

-ElemType=Folder

-PathName=Include Files

-Child=Root.Include Files...\demo\halconf.h

-Config.0=Root.Include Files.Config.0

-Config.1=Root.Include Files.Config.1

-

-[Root.Include Files.Config.0]

-Settings.0.0=Root.Include Files.Config.0.Settings.0

-Settings.0.1=Root.Include Files.Config.0.Settings.1

-Settings.0.2=Root.Include Files.Config.0.Settings.2

-Settings.0.3=Root.Include Files.Config.0.Settings.3

-

-[Root.Include Files.Config.1]

-Settings.1.0=Root.Include Files.Config.1.Settings.0

-Settings.1.1=Root.Include Files.Config.1.Settings.1

-Settings.1.2=Root.Include Files.Config.1.Settings.2

-Settings.1.3=Root.Include Files.Config.1.Settings.3

-

-[Root.Include Files.Config.0.Settings.0]

-String.6.0=2010,6,4,10,10,40

-String.8.0=Debug

-Int.0=0

-Int.1=0

-

-[Root.Include Files.Config.0.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DEBUG DGC(data) AUTO -customDebugOpt -CustomOptimOT(0) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB LAOB PIN(..\..\..\test) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\..\..\..\os\ports\RC\stm8) PIN(..\..\..\..\os\kernel\include) PIN(..\demo)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,42,15

-

-[Root.Include Files.Config.0.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET DEBUG NOPR ERRORPRINT MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,46,5

-

-[Root.Include Files.Config.0.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Include Files.Config.1.Settings.0]

-String.6.0=2010,6,4,10,10,40

-String.8.0=Release

-Int.0=0

-Int.1=0

-

-[Root.Include Files.Config.1.Settings.1]

-String.2.0=Compiling $(InputFile)...

-String.3.0=rcstm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) WRV(0) STM8(SMALL) DGC(data) AUTO -customSpeedOpt -CustomOptimOT(7,SPEED) -CustomBasicLstPR($(IntermPath)$(InputName).lst) CD CO SB NOIS CD CO SB LAOB PIN(..\..\..\..\boards\st_stm8s_discovery) PIN(..\demo) PIN(..\..\..\..\os\kernel\include) PIN(..\..\..\..\os\hal\include) PIN(..\..\..\..\os\hal\platforms\stm8s) PIN(..\..\..\test) PIN(..\..\..\..\os\ports\rc\stm8)

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Include Files.Config.1.Settings.2]

-String.2.0=Assembling $(InputFile)...

-String.3.0=mastm8 $(InputFile) OBJECT($(IntermPath)$(InputName).$(ObjectExt)) $(ToolsetIncOpts) QUIET NOPR ERRORPRINT NOCOND NOLIST NOLISTINCLUDE NOGEN NOSB NOXREF MODESTM8

-String.4.0=$(IntermPath)$(InputName).$(ObjectExt)

-String.5.0=$(IntermPath)$(InputName).lst

-String.6.0=2010,6,26,17,22,23

-

-[Root.Include Files.Config.1.Settings.3]

-String.2.0=Performing Custom Build on $(InputFile)

-String.3.0=

-String.4.0=

-String.5.0=

-String.6.0=2010,6,4,10,10,40

-

-[Root.Include Files...\demo\halconf.h]

-ElemType=File

-PathName=..\demo\halconf.h

-Next=Root.Include Files...\demo\chconf.h

-

-[Root.Include Files...\demo\chconf.h]

-ElemType=File

-PathName=..\demo\chconf.h

-Next=Root.Include Files...\demo\mcuconf.h

-

-[Root.Include Files...\demo\mcuconf.h]

-ElemType=File

-PathName=..\demo\mcuconf.h

-Next=Root.Include Files.Include Files\board

-

-[Root.Include Files.Include Files\board]

-ElemType=Folder

-PathName=Include Files\board

-Child=Root.Include Files.Include Files\board...\..\..\..\boards\st_stm8s_discovery\board.h

-Next=Root.Include Files.Include Files\os

-

-[Root.Include Files.Include Files\board...\..\..\..\boards\st_stm8s_discovery\board.h]

-ElemType=File

-PathName=..\..\..\..\boards\st_stm8s_discovery\board.h

-

-[Root.Include Files.Include Files\os]

-ElemType=Folder

-PathName=Include Files\os

-Child=Root.Include Files.Include Files\os.Include Files\os\hal

-

-[Root.Include Files.Include Files\os.Include Files\os\hal]

-ElemType=Folder

-PathName=Include Files\os\hal

-Child=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\spi.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\spi.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\spi.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\serial.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\serial.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\serial.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pwm.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pwm.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\pwm.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pal.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\pal.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\pal.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mmc_spi.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mmc_spi.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mmc_spi.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mii.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mii.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mii.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mac.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\mac.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\mac.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\hal.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\hal.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\hal.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\can.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\can.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\can.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\adc.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal...\..\..\..\os\hal\include\adc.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\include\adc.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s]

-ElemType=Folder

-PathName=Include Files\os\hal\stm8s

-Child=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\spi_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\spi_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s_type.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s_type.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\stm8s_type.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\stm8s.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\stm8s.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\serial_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\serial_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\pal_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\pal_lld.h

-Next=Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\hal.Include Files\os\hal\stm8s...\..\..\..\os\hal\platforms\stm8s\hal_lld.h]

-ElemType=File

-PathName=..\..\..\..\os\hal\platforms\stm8s\hal_lld.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel]

-ElemType=Folder

-PathName=Include Files\os\kernel

-Child=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chvt.h

-Next=Root.Include Files.Include Files\os.Include Files\os\port

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chvt.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chvt.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chthreads.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chthreads.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chthreads.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsys.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsys.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chsys.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chstreams.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chstreams.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chstreams.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsem.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chsem.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chsem.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chschd.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chschd.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chschd.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chregistry.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chregistry.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chregistry.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chqueues.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chqueues.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chqueues.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmtx.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmtx.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmtx.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmsg.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmsg.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmsg.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmempools.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmempools.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmempools.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmemcore.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmemcore.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmemcore.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmboxes.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chmboxes.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chmboxes.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chlists.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chlists.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chlists.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chioch.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chioch.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chioch.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chinline.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chinline.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chinline.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chheap.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chheap.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chheap.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chevents.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chevents.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chevents.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdynamic.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdynamic.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chdynamic.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdebug.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chdebug.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chdebug.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chcond.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\chcond.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\chcond.h

-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\ch.h

-

-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\..\os\kernel\include\ch.h]

-ElemType=File

-PathName=..\..\..\..\os\kernel\include\ch.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port]

-ElemType=Folder

-PathName=Include Files\os\port

-Child=Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\rc\stm8\chtypes.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\rc\stm8\chtypes.h]

-ElemType=File

-PathName=..\..\..\..\os\ports\rc\stm8\chtypes.h

-Next=Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\rc\stm8\chcore.h

-

-[Root.Include Files.Include Files\os.Include Files\os\port...\..\..\..\os\ports\rc\stm8\chcore.h]

-ElemType=File

-PathName=..\..\..\..\os\ports\rc\stm8\chcore.h
\ No newline at end of file
diff --git a/testhal/common/testbuild/Makefile b/testhal/common/testbuild/Makefile
index 280c5f3e3..ce5346949 100644
--- a/testhal/common/testbuild/Makefile
+++ b/testhal/common/testbuild/Makefile
@@ -23,6 +23,16 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -47,11 +57,6 @@ ifeq ($(USE_FPU),)
   USE_FPU = no

 endif

 

-# Enable this if you really want to use the STM FWLib.

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = no

-endif

-

 #

 # Architecture or project specific options

 ##############################################################################

@@ -70,7 +75,7 @@ include $(CHIBIOS)/os/hal/templates/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)/test/test.mk

+#include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

@@ -139,6 +144,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

@@ -211,11 +217,4 @@ else
   DDEFS += -DCORTEX_USE_FPU=FALSE

 endif

 

-ifeq ($(USE_FWLIB),yes)

-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

-  CSRC += $(STM32SRC)

-  INCDIR += $(STM32INC)

-  USE_OPT += -DUSE_STDPERIPH_DRIVER

-endif

-

 include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk