Minor fixes

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

1 files changed, 136 insertions, 49 deletions

diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
index e3306d745..0054fd60a 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
@@ -28,167 +28,183 @@
 #ifndef HALCONF_H

 #define HALCONF_H

 

-#include "mcuconf.h"

+#define _CHIBIOS_HAL_CONF_

+#define _CHIBIOS_HAL_CONF_VER_6_0_

 

-/**

- * @brief   Enables the TM subsystem.

- */

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

-#define HAL_USE_TM                  TRUE

-#endif

+#include "mcuconf.h"

 

 /**

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

  */

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

-#define HAL_USE_CRY                 FALSE

+#define HAL_USE_CRY                         FALSE

 #endif

 

 /**

  * @brief   Enables the DAC subsystem.

  */

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

-#define HAL_USE_DAC                 FALSE

+#define HAL_USE_DAC                         FALSE

 #endif

 

 /**

  * @brief   Enables the EXT subsystem.

  */

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

-#define HAL_USE_EXT                 FALSE

+#define HAL_USE_EXT                         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 QSPI subsystem.

  */

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

-#define HAL_USE_QSPI                FALSE

+#define HAL_USE_QSPI                        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              FALSE

+#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 SPI subsystem.

  */

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

-#define HAL_USE_SPI                 FALSE

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

+

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

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

 

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

@@ -200,7 +216,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

 

 /**

@@ -208,7 +224,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

 

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

@@ -219,7 +235,7 @@
  * @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

 

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

@@ -245,6 +261,26 @@
 #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

+

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

 /* I2C driver related settings.                                              */

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

 

@@ -252,7 +288,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

 

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

@@ -260,17 +296,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

 

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

@@ -286,7 +322,27 @@
  *          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

+

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

+/* 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                       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           TRUE

 #endif

 

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

@@ -298,7 +354,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

 

 /**

@@ -307,7 +363,7 @@
  *          at @p FALSE.

  */

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

-#define SDC_MMC_SUPPORT             FALSE

+#define SDC_MMC_SUPPORT                     FALSE

 #endif

 

 /**

@@ -317,7 +373,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

 

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

@@ -330,7 +400,7 @@
  *          default configuration.

  */

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

-#define SERIAL_DEFAULT_BITRATE      38400

+#define SERIAL_DEFAULT_BITRATE              38400

 #endif

 

 /**

@@ -341,7 +411,7 @@
  *          buffers.

  */

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

-#define SERIAL_BUFFERS_SIZE         16

+#define SERIAL_BUFFERS_SIZE                 16

 #endif

 

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

@@ -356,7 +426,7 @@
  *          buffers.

  */

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

-#define SERIAL_USB_BUFFERS_SIZE     256

+#define SERIAL_USB_BUFFERS_SIZE             256

 #endif

 

 /**

@@ -364,7 +434,7 @@
  * @note    The default is 2 buffers.

  */

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

-#define SERIAL_USB_BUFFERS_NUMBER   2

+#define SERIAL_USB_BUFFERS_NUMBER           2

 #endif

 

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

@@ -376,15 +446,32 @@
  * @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

 

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

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

  */

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

-#define UART_USE_WAIT               FALSE

+#define UART_USE_WAIT                       FALSE

 #endif

 

 /**

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

  */

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

-#define UART_USE_MUTUAL_EXCLUSION   FALSE

+#define UART_USE_MUTUAL_EXCLUSION           FALSE

 #endif

 

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

@@ -416,7 +503,7 @@
  * @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

 

 #endif /* HALCONF_H */