Minor fixes

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

3 files changed, 555 insertions, 0 deletions

diff --git a/tools/ftl/processors/conf/halconf/halconf.h.ftl b/tools/ftl/processors/conf/halconf/halconf.h.ftl
new file mode 100644
index 000000000..fd7b869ac
--- /dev/null
+++ b/tools/ftl/processors/conf/halconf/halconf.h.ftl
@@ -0,0 +1,522 @@
+[#ftl]

+[#--

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio.

+

+    This file is part of ChibiOS.

+

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

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

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

+    (at your option) any later version.

+

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

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

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

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

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

+  --]

+[@pp.dropOutputFile /]

+[#import "/@lib/libutils.ftl" as utils /]

+[#import "/@lib/liblicense.ftl" as license /]

+[@pp.changeOutputFile name="halconf.h" /]

+/*

+[@license.EmitLicenseAsText /]

+*/

+

+/**

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

+

+#define _CHIBIOS_HAL_CONF_

+#define _CHIBIOS_HAL_CONF_VER_6_0_

+

+#include "mcuconf.h"

+

+/**

+ * @brief   Enables the PAL subsystem.

+ */

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

+#define HAL_USE_PAL                         ${doc.HAL_USE_PAL!"TRUE"}

+#endif

+

+/**

+ * @brief   Enables the ADC subsystem.

+ */

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

+#define HAL_USE_ADC                         ${doc.HAL_USE_ADC!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the CAN subsystem.

+ */

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

+#define HAL_USE_CAN                         ${doc.HAL_USE_CAN!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the cryptographic subsystem.

+ */

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

+#define HAL_USE_CRY                         ${doc.HAL_USE_CRY!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the DAC subsystem.

+ */

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

+#define HAL_USE_DAC                         ${doc.HAL_USE_DAC!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the EXT subsystem.

+ */

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

+#define HAL_USE_EXT                         ${doc.HAL_USE_EXT!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the GPT subsystem.

+ */

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

+#define HAL_USE_GPT                         ${doc.HAL_USE_GPT!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the I2C subsystem.

+ */

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

+#define HAL_USE_I2C                         ${doc.HAL_USE_I2C!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the I2S subsystem.

+ */

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

+#define HAL_USE_I2S                         ${doc.HAL_USE_I2S!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the ICU subsystem.

+ */

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

+#define HAL_USE_ICU                         ${doc.HAL_USE_ICU!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the MAC subsystem.

+ */

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

+#define HAL_USE_MAC                         ${doc.HAL_USE_MAC!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the MMC_SPI subsystem.

+ */

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

+#define HAL_USE_MMC_SPI                     ${doc.HAL_USE_MMC_SPI!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the PWM subsystem.

+ */

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

+#define HAL_USE_PWM                         ${doc.HAL_USE_PWM!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the QSPI subsystem.

+ */

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

+#define HAL_USE_QSPI                        ${doc.HAL_USE_QSPI!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the RTC subsystem.

+ */

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

+#define HAL_USE_RTC                         ${doc.HAL_USE_RTC!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the SDC subsystem.

+ */

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

+#define HAL_USE_SDC                         ${doc.HAL_USE_SDC!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the SERIAL subsystem.

+ */

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

+#define HAL_USE_SERIAL                      ${doc.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                  ${doc.HAL_USE_SERIAL_USB!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the SPI subsystem.

+ */

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

+#define HAL_USE_SPI                         ${doc.HAL_USE_SPI!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the UART subsystem.

+ */

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

+#define HAL_USE_UART                        ${doc.HAL_USE_UART!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the USB subsystem.

+ */

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

+#define HAL_USE_USB                         ${doc.HAL_USE_USB!"FALSE"}

+#endif

+

+/**

+ * @brief   Enables the WDG subsystem.

+ */

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

+#define HAL_USE_WDG                         ${doc.HAL_USE_WDG!"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                   ${doc.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                        ${doc.PAL_USE_WAIT!"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                        ${doc.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            ${doc.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                  ${doc.CAN_USE_SLEEP_MODE!"TRUE"}

+#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                ${doc.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            ${doc.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                        ${doc.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            ${doc.DAC_USE_MUTUAL_EXCLUSION!"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            ${doc.I2C_USE_MUTUAL_EXCLUSION!"TRUE"}

+#endif

+

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

+/* MAC driver related settings.                                              */

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

+

+/**

+ * @brief   Enables the zero-copy API.

+ */

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

+#define MAC_USE_ZERO_COPY                   ${doc.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                      ${doc.MAC_USE_EVENTS!"FALSE"}

+#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                    ${doc.MMC_NICE_WAITING!"TRUE"}

+#endif

+

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

+/* QSPI driver related settings.                                             */

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

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define QSPI_USE_WAIT                       ${doc.QSPI_USE_WAIT!"TRUE"}

+#endif

+

+/**

+ * @brief   Enables the @p qspiAcquireBus() and @p qspiReleaseBus() APIs.

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

+ */

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

+#define QSPI_USE_MUTUAL_EXCLUSION           ${doc.QSPI_USE_MUTUAL_EXCLUSION!"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                      ${doc.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                     ${doc.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                    ${doc.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                    ${doc.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                        ${doc.SDC_INIT_OCR!"0x80100000U"}

+#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              ${doc.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 16 bytes for both the transmission and receive

+ *          buffers.

+ */

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

+#define SERIAL_BUFFERS_SIZE                 ${doc.SERIAL_BUFFERS_SIZE!"16"}

+#endif

+

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

+/* 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 256 bytes for both the transmission and receive

+ *          buffers.

+ */

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

+#define SERIAL_USB_BUFFERS_SIZE             ${doc.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           ${doc.SERIAL_USB_BUFFERS_NUMBER!"2"}

+#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                        ${doc.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                    ${doc.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            ${doc.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                     ${doc.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                       ${doc.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           ${doc.UART_USE_MUTUAL_EXCLUSION!"FALSE"}

+#endif

+

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

+/* USB driver related settings.                                              */

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

+

+/**

+ * @brief   Enables synchronous APIs.

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

+ */

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

+#define USB_USE_WAIT                        ${doc.USB_USE_WAIT!"FALSE"}

+#endif

+

+#endif /* HALCONF_H */

+

+/** @} */

diff --git a/tools/updater/halconf.fmpp b/tools/updater/halconf.fmpp
new file mode 100644
index 000000000..120431153
--- /dev/null
+++ b/tools/updater/halconf.fmpp
@@ -0,0 +1,11 @@
+sourceRoot: ../ftl/processors/conf/halconf
+outputRoot: .
+dataRoot: .
+
+freemarkerLinks: {
+    lib: ../ftl/libs
+}
+
+data : {
+  doc:properties (./values.txt)
+}
diff --git a/tools/updater/update_halconf.sh b/tools/updater/update_halconf.sh
new file mode 100644
index 000000000..86c0eed15
--- /dev/null
+++ b/tools/updater/update_halconf.sh
@@ -0,0 +1,22 @@
+#!/bin/bash

+if [ $# -eq 0 ]

+then

+  find ../.. -name "halconf.h" -exec bash update_halconf.sh "{}" \;

+elif [ $# -eq 1 ]

+then

+#  if egrep -q "" $1

+#  then

+    echo Processing: $1

+    cat $1 | egrep -e "\#define\s+[a-zA-Z0-9_]*\s+[a-zA-Z0-9_]" | cut --bytes=9- - | sed 's/  */=/g' > ./values.txt

+    if ! fmpp -q -C halconf.fmpp

+    then

+      echo

+      echo "aborted"

+      exit 1

+    fi

+    cp ./halconf.h $1

+    rm ./halconf.h ./values.txt

+#  fi

+else

+  echo "illegal number of arguments"

+fi