Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib

3 files changed, 255 insertions, 63 deletions

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
index 7327b35..f6b8b07 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
@@ -93,7 +93,7 @@ include $(CHIBIOS)/os/license/license.mk
 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk

 # HAL-OSAL files (optional).

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

+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk

 include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/KL2x/platform.mk

 include $(CHIBIOS_CONTRIB)/os/hal/boards/FREESCALE_FREEDOM_KL26Z/board.mk

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

@@ -108,7 +108,7 @@ include $(CHIBIOS)/os/hal/lib/streams/streams.mk
 include $(CHIBIOS)/os/various/shell/shell.mk

 

 # Define linker script file here

-LDSCRIPT= $(STARTUPLD)/MKL2xZ128.ld

+LDSCRIPT= $(STARTUPLD_CONTRIB)/MKL2xZ128.ld

 

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

 # setting.

@@ -215,5 +215,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk

 include $(RULESPATH)/rules.mk

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
index 1750f63..24691d7 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    templates/chconf.h

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

@@ -29,7 +29,7 @@
 #define CHCONF_H

 

 #define _CHIBIOS_RT_CONF_

-#define _CHIBIOS_RT_CONF_VER_5_1_

+#define _CHIBIOS_RT_CONF_VER_6_0_

 

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

 /**

@@ -52,7 +52,7 @@
  *          setting also defines the system tick time unit.

  */

 #if !defined(CH_CFG_ST_FREQUENCY)

-#define CH_CFG_ST_FREQUENCY                 1000

+#define CH_CFG_ST_FREQUENCY                 10000

 #endif

 

 /**

@@ -80,7 +80,7 @@
  *          this value.

  */

 #if !defined(CH_CFG_ST_TIMEDELTA)

-#define CH_CFG_ST_TIMEDELTA                 0

+#define CH_CFG_ST_TIMEDELTA                 2

 #endif

 

 /** @} */

@@ -105,7 +105,7 @@
  *          must be set to zero in that case.

  */

 #if !defined(CH_CFG_TIME_QUANTUM)

-#define CH_CFG_TIME_QUANTUM                 2

+#define CH_CFG_TIME_QUANTUM                 0

 #endif

 

 /**

@@ -360,7 +360,7 @@
 #endif

 

 /**

- * @brief  Objects FIFOs APIs.

+ * @brief   Objects FIFOs APIs.

  * @details If enabled then the objects FIFOs APIs are included

  *          in the kernel.

  *

@@ -371,6 +371,17 @@
 #endif

 

 /**

+ * @brief   Pipes APIs.

+ * @details If enabled then the pipes APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#if !defined(CH_CFG_USE_PIPES)

+#define CH_CFG_USE_PIPES                    TRUE

+#endif

+

+/**

  * @brief   Dynamic Threads APIs.

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

  *          in the kernel.

@@ -447,6 +458,13 @@
 #define CH_CFG_FACTORY_OBJ_FIFOS            TRUE

 #endif

 

+/**

+ * @brief   Enables factory for Pipes.

+ */

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

+#define CH_CFG_FACTORY_PIPES                TRUE

+#endif

+

 /** @} */

 

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

@@ -473,7 +491,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_SYSTEM_STATE_CHECK)

-#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 #endif

 

 /**

@@ -484,7 +502,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_CHECKS)

-#define CH_DBG_ENABLE_CHECKS                TRUE

+#define CH_DBG_ENABLE_CHECKS                FALSE

 #endif

 

 /**

@@ -496,7 +514,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_ASSERTS)

-#define CH_DBG_ENABLE_ASSERTS               TRUE

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 #endif

 

 /**

@@ -506,7 +524,7 @@
  * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.

  */

 #if !defined(CH_DBG_TRACE_MASK)

-#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_ALL

+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED

 #endif

 

 /**

@@ -529,7 +547,7 @@
  *          @p panic_msg variable set to @p NULL.

  */

 #if !defined(CH_DBG_ENABLE_STACK_CHECK)

-#define CH_DBG_ENABLE_STACK_CHECK           TRUE

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 #endif

 

 /**

@@ -541,7 +559,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_FILL_THREADS)

-#define CH_DBG_FILL_THREADS                 TRUE

+#define CH_DBG_FILL_THREADS                 FALSE

 #endif

 

 /**

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/halconf.h b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/halconf.h
index a299d39..5dd22a7 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/halconf.h
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/halconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - (C) 2015-2016 flabbergast <s3+flabbergast@sdfeu.org>

+    ChibiOS - Copyright (C) 2006..2018 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.

@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    FRDM-KL26Z/USB_SERIAL/halconf.h

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

@@ -25,8 +25,11 @@
  * @{

  */

 

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

+#ifndef HALCONF_H

+#define HALCONF_H

+

+#define _CHIBIOS_HAL_CONF_

+#define _CHIBIOS_HAL_CONF_VER_7_0_

 

 #include "mcuconf.h"

 

@@ -34,140 +37,181 @@
  * @brief   Enables the PAL subsystem.

  */

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

-#define HAL_USE_PAL                 TRUE

+#define HAL_USE_PAL                         TRUE

 #endif

 

 /**

  * @brief   Enables the ADC subsystem.

  */

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

-#define HAL_USE_ADC                 FALSE

+#define HAL_USE_ADC                         FALSE

 #endif

 

 /**

  * @brief   Enables the CAN subsystem.

  */

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

-#define HAL_USE_CAN                 FALSE

+#define HAL_USE_CAN                         FALSE

 #endif

 

 /**

- * @brief   Enables the DAC subsystem.

+ * @brief   Enables the cryptographic subsystem.

  */

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

-#define HAL_USE_DAC                 FALSE

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

+#define HAL_USE_CRY                         FALSE

 #endif

 

 /**

- * @brief   Enables the EXT subsystem.

+ * @brief   Enables the DAC subsystem.

  */

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

-#define HAL_USE_EXT                 FALSE

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

+#define HAL_USE_DAC                         FALSE

 #endif

 

 /**

  * @brief   Enables the GPT subsystem.

  */

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

-#define HAL_USE_GPT                 FALSE

+#define HAL_USE_GPT                         FALSE

 #endif

 

 /**

  * @brief   Enables the I2C subsystem.

  */

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

-#define HAL_USE_I2C                 FALSE

+#define HAL_USE_I2C                         FALSE

 #endif

 

 /**

  * @brief   Enables the I2S subsystem.

  */

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

-#define HAL_USE_I2S                 FALSE

+#define HAL_USE_I2S                         FALSE

 #endif

 

 /**

  * @brief   Enables the ICU subsystem.

  */

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

-#define HAL_USE_ICU                 FALSE

+#define HAL_USE_ICU                         FALSE

 #endif

 

 /**

  * @brief   Enables the MAC subsystem.

  */

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

-#define HAL_USE_MAC                 FALSE

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

+#define HAL_USE_MMC_SPI                     FALSE

 #endif

 

 /**

  * @brief   Enables the PWM subsystem.

  */

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

-#define HAL_USE_PWM                 FALSE

+#define HAL_USE_PWM                         FALSE

 #endif

 

 /**

  * @brief   Enables the RTC subsystem.

  */

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

-#define HAL_USE_RTC                 FALSE

+#define HAL_USE_RTC                         FALSE

 #endif

 

 /**

  * @brief   Enables the SDC subsystem.

  */

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

-#define HAL_USE_SDC                 FALSE

+#define HAL_USE_SDC                         FALSE

 #endif

 

 /**

  * @brief   Enables the SERIAL subsystem.

  */

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

-#define HAL_USE_SERIAL              TRUE

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

+#define HAL_USE_SERIAL_USB                  TRUE

+#endif

+

+/**

+ * @brief   Enables the SIO subsystem.

+ */

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

+#define HAL_USE_SIO                         FALSE

 #endif

 

 /**

  * @brief   Enables the SPI subsystem.

  */

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

-#define HAL_USE_SPI                 FALSE

+#define HAL_USE_SPI                         FALSE

+#endif

+

+/**

+ * @brief   Enables the TRNG subsystem.

+ */

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

+#define HAL_USE_TRNG                        FALSE

 #endif

 

 /**

  * @brief   Enables the UART subsystem.

  */

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

-#define HAL_USE_UART                FALSE

+#define HAL_USE_UART                        FALSE

 #endif

 

 /**

  * @brief   Enables the USB subsystem.

  */

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

-#define HAL_USE_USB                 TRUE

+#define HAL_USE_USB                         TRUE

 #endif

 

 /**

  * @brief   Enables the WDG subsystem.

  */

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

-#define HAL_USE_WDG                 FALSE

+#define HAL_USE_WDG                         FALSE

+#endif

+

+/**

+ * @brief   Enables the WSPI subsystem.

+ */

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

+#define HAL_USE_WSPI                        FALSE

+#endif

+

+/*===========================================================================*/

+/* PAL driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define PAL_USE_CALLBACKS                   FALSE

+#endif

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define PAL_USE_WAIT                        FALSE

 #endif

 

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

@@ -179,7 +223,7 @@
  * @note    Disabling this option saves both code and data space.

  */

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

-#define ADC_USE_WAIT                TRUE

+#define ADC_USE_WAIT                        TRUE

 #endif

 

 /**

@@ -187,7 +231,7 @@
  * @note    Disabling this option saves both code and data space.

  */

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

-#define ADC_USE_MUTUAL_EXCLUSION    TRUE

+#define ADC_USE_MUTUAL_EXCLUSION            TRUE

 #endif

 

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

@@ -198,7 +242,56 @@
  * @brief   Sleep mode related APIs inclusion switch.

  */

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

-#define CAN_USE_SLEEP_MODE          TRUE

+#define CAN_USE_SLEEP_MODE                  TRUE

+#endif

+

+/**

+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.

+ */

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

+#define CAN_ENFORCE_USE_CALLBACKS           FALSE

+#endif

+

+/*===========================================================================*/

+/* CRY driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables the SW fall-back of the cryptographic driver.

+ * @details When enabled, this option, activates a fall-back software

+ *          implementation for algorithms not supported by the underlying

+ *          hardware.

+ * @note    Fall-back implementations may not be present for all algorithms.

+ */

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

+#define HAL_CRY_USE_FALLBACK                FALSE

+#endif

+

+/**

+ * @brief   Makes the driver forcibly use the fall-back implementations.

+ */

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

+#define HAL_CRY_ENFORCE_FALLBACK            FALSE

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

 

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

@@ -209,7 +302,7 @@
  * @brief   Enables the mutual exclusion APIs on the I2C bus.

  */

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

-#define I2C_USE_MUTUAL_EXCLUSION    TRUE

+#define I2C_USE_MUTUAL_EXCLUSION            TRUE

 #endif

 

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

@@ -217,17 +310,17 @@
 /*===========================================================================*/

 

 /**

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

+ * @brief   Enables the zero-copy API.

  */

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

-#define MAC_USE_ZERO_COPY           FALSE

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

+#define MAC_USE_EVENTS                      TRUE

 #endif

 

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

@@ -243,7 +336,7 @@
  *          use a DMA channel and heavily loads the CPU.

  */

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

-#define MMC_NICE_WAITING            TRUE

+#define MMC_NICE_WAITING                    TRUE

 #endif

 

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

@@ -255,7 +348,7 @@
  * @note    Attempts are performed at 10mS intervals.

  */

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

-#define SDC_INIT_RETRY              100

+#define SDC_INIT_RETRY                      100

 #endif

 

 /**

@@ -264,7 +357,7 @@
  *          at @p FALSE.

  */

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

-#define SDC_MMC_SUPPORT             FALSE

+#define SDC_MMC_SUPPORT                     FALSE

 #endif

 

 /**

@@ -274,7 +367,21 @@
  *          lower priority, this may slow down the driver a bit however.

  */

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

-#define SDC_NICE_WAITING            TRUE

+#define SDC_NICE_WAITING                    TRUE

+#endif

+

+/**

+ * @brief   OCR initialization constant for V20 cards.

+ */

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

+#define SDC_INIT_OCR_V20                    0x50FF8000U

+#endif

+

+/**

+ * @brief   OCR initialization constant for non-V20 cards.

+ */

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

+#define SDC_INIT_OCR                        0x80100000U

 #endif

 

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

@@ -287,18 +394,18 @@
  *          default configuration.

  */

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

-#define SERIAL_DEFAULT_BITRATE      38400

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

+ * @note    The default is 16 bytes for both the transmission and receive

  *          buffers.

  */

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

-#define SERIAL_BUFFERS_SIZE         16

+#define SERIAL_BUFFERS_SIZE                 16

 #endif

 

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

@@ -309,11 +416,19 @@
  * @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

+ * @note    The default is 256 bytes for both the transmission and receive

  *          buffers.

  */

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

-#define SERIAL_USB_BUFFERS_SIZE     256

+#define SERIAL_USB_BUFFERS_SIZE             256

+#endif

+

+/**

+ * @brief   Serial over USB number of buffers.

+ * @note    The default is 2 buffers.

+ */

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

+#define SERIAL_USB_BUFFERS_NUMBER           2

 #endif

 

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

@@ -325,15 +440,52 @@
  * @note    Disabling this option saves both code and data space.

  */

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

-#define SPI_USE_WAIT                TRUE

+#define SPI_USE_WAIT                        TRUE

+#endif

+

+/**

+ * @brief   Enables circular transfers APIs.

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

+ */

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

+#define SPI_USE_CIRCULAR                    FALSE

 #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

+#define SPI_USE_MUTUAL_EXCLUSION            TRUE

+#endif

+

+/**

+ * @brief   Handling method for SPI CS line.

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

+ */

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

+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD

+#endif

+

+/*===========================================================================*/

+/* UART driver related settings.                                             */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define UART_USE_WAIT                       FALSE

+#endif

+

+/**

+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.

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

+ */

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

+#define UART_USE_MUTUAL_EXCLUSION           FALSE

 #endif

 

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

@@ -345,9 +497,31 @@
  * @note    Disabling this option saves both code and data space.

  */

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

-#define USB_USE_WAIT                FALSE

+#define USB_USE_WAIT                        FALSE

+#endif

+

+/*===========================================================================*/

+/* WSPI driver related settings.                                             */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define WSPI_USE_WAIT                       TRUE

 #endif

 

-#endif /* _HALCONF_H_ */

+/**

+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.

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

+ */

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

+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE

+#endif

+

+#include "halconf_community.h"

+

+#endif /* HALCONF_H */

 

 /** @} */