From 2644acd83a14e8652e30d65ac934d95992175ea0 Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Tue, 1 Oct 2019 09:18:18 -0300 Subject: USBH: testhal: fix compile with ChibiOS 18.2 --- testhal/STM32/STM32F4xx/USB_HOST/halconf.h | 134 +++-------------------------- 1 file changed, 10 insertions(+), 124 deletions(-) (limited to 'testhal/STM32/STM32F4xx/USB_HOST/halconf.h') diff --git a/testhal/STM32/STM32F4xx/USB_HOST/halconf.h b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h index 8b5d823..7096a3b 100644 --- a/testhal/STM32/STM32F4xx/USB_HOST/halconf.h +++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h @@ -28,9 +28,6 @@ #ifndef HALCONF_H #define HALCONF_H -#define _CHIBIOS_HAL_CONF_ -#define _CHIBIOS_HAL_CONF_VER_7_1_ - #include "mcuconf.h" /** @@ -69,10 +66,10 @@ #endif /** - * @brief Enables the EFlash subsystem. + * @brief Enables the EXT subsystem. */ -#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__) -#define HAL_USE_EFL FALSE +#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) +#define HAL_USE_EXT FALSE #endif /** @@ -124,6 +121,13 @@ #define HAL_USE_PWM FALSE #endif +/** + * @brief Enables the QSPI subsystem. + */ +#if !defined(HAL_USE_QSPI) || defined(__DOXYGEN__) +#define HAL_USE_QSPI FALSE +#endif + /** * @brief Enables the RTC subsystem. */ @@ -152,13 +156,6 @@ #define HAL_USE_SERIAL_USB FALSE #endif -/** - * @brief Enables the SIO subsystem. - */ -#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__) -#define HAL_USE_SIO FALSE -#endif - /** * @brief Enables the SPI subsystem. */ @@ -166,13 +163,6 @@ #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. */ @@ -194,33 +184,6 @@ #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 - /*===========================================================================*/ /* ADC driver related settings. */ /*===========================================================================*/ @@ -252,13 +215,6 @@ #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. */ /*===========================================================================*/ @@ -281,26 +237,6 @@ #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 - /*===========================================================================*/ /* I2C driver related settings. */ /*===========================================================================*/ @@ -377,20 +313,6 @@ #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 - /*===========================================================================*/ /* SERIAL driver related settings. */ /*===========================================================================*/ @@ -450,14 +372,6 @@ #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. @@ -466,14 +380,6 @@ #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. */ /*===========================================================================*/ @@ -506,26 +412,6 @@ #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 - -/** - * @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 */ -- cgit v1.2.3