From 5ad3d2426f44f13439baf3f7f9de7fb9ddf1c00c Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 6 Oct 2018 04:48:41 +0000 Subject: Removed references to QSPI to most configuration files, more to do. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12330 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- .../multi/PAL/cfg/stm32f051_discovery/halconf.h | 27 ---------------------- .../STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32f303_discovery/halconf.h | 27 ---------------------- .../STM32/multi/PAL/cfg/stm32f373_eval/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32f407_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32f429_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32f746_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32l053_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32l151_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32l476_discovery/halconf.h | 27 ---------------------- .../multi/PAL/cfg/stm32l476_discovery/mcuconf.h | 12 +++++----- .../QSPI-MFS/cfg/stm32l476_discovery/halconf.h | 27 ---------------------- .../QSPI-MFS/cfg/stm32l476_discovery/mcuconf.h | 12 +++++----- .../multi/SPI/cfg/stm32f091_nucleo64/halconf.h | 27 ---------------------- .../multi/SPI/cfg/stm32f303_discovery/halconf.h | 27 ---------------------- .../multi/SPI/cfg/stm32f407_discovery/halconf.h | 27 ---------------------- .../multi/SPI/cfg/stm32h743_nucleo144/halconf.h | 27 ---------------------- .../multi/SPI/cfg/stm32l476_discovery/halconf.h | 27 ---------------------- .../multi/SPI/cfg/stm32l476_discovery/mcuconf.h | 12 +++++----- .../multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h | 27 ---------------------- .../multi/UART/cfg/stm32f091_nucleo64/halconf.h | 27 ---------------------- .../multi/UART/cfg/stm32f303_discovery/halconf.h | 27 ---------------------- .../multi/UART/cfg/stm32f407_discovery/halconf.h | 27 ---------------------- .../multi/UART/cfg/stm32f746_discovery/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32f303_discovery/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32f407_discovery/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32f746_discovery/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32h743_nucleo144/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32l476_discovery/halconf.h | 27 ---------------------- .../USB_CDC/cfg/stm32l476_discovery/mcuconf.h | 12 +++++----- .../WSPI-MFS/cfg/stm32l476_discovery/halconf.h | 27 ---------------------- .../WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h | 6 ----- 32 files changed, 24 insertions(+), 759 deletions(-) (limited to 'testhal/STM32/multi') diff --git a/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h index 93e463b0d..55a7e420c 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h index 249a73045..190a14daf 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h @@ -222,12 +222,6 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7 #define STM32_PWM_TIM8_IRQ_PRIORITY 7 -/* - * QSPI driver system settings. - */ -#define STM32_QSPI_USE_QUADSPI1 FALSE -#define STM32_QSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) - /* * SDC driver system settings. */ @@ -324,4 +318,10 @@ */ #define STM32_WDG_USE_IWDG FALSE +/* + * WSPI driver system settings. + */ +#define STM32_WSPI_USE_QUADSPI1 FALSE +#define STM32_WSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) + #endif /* MCUCONF_H */ diff --git a/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/halconf.h index 93c9a9a6d..89be0946a 100644 --- a/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/halconf.h +++ b/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/halconf.h @@ -124,13 +124,6 @@ #define HAL_USE_PWM FALSE #endif -/** - * @brief Enables the QSPI subsystem. - */ -#if !defined(HAL_USE_QSPI) || defined(__DOXYGEN__) -#define HAL_USE_QSPI TRUE -#endif - /** * @brief Enables the RTC subsystem. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/mcuconf.h index 29c87a7f5..190a14daf 100644 --- a/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/QSPI-MFS/cfg/stm32l476_discovery/mcuconf.h @@ -222,12 +222,6 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7 #define STM32_PWM_TIM8_IRQ_PRIORITY 7 -/* - * QSPI driver system settings. - */ -#define STM32_QSPI_USE_QUADSPI1 TRUE -#define STM32_QSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) - /* * SDC driver system settings. */ @@ -324,4 +318,10 @@ */ #define STM32_WDG_USE_IWDG FALSE +/* + * WSPI driver system settings. + */ +#define STM32_WSPI_USE_QUADSPI1 FALSE +#define STM32_WSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) + #endif /* MCUCONF_H */ diff --git a/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h index 80645b386..d18ac82cf 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h @@ -222,12 +222,6 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7 #define STM32_PWM_TIM8_IRQ_PRIORITY 7 -/* - * QSPI driver system settings. - */ -#define STM32_QSPI_USE_QUADSPI1 FALSE -#define STM32_QSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) - /* * SDC driver system settings. */ @@ -324,4 +318,10 @@ */ #define STM32_WDG_USE_IWDG FALSE +/* + * WSPI driver system settings. + */ +#define STM32_WSPI_USE_QUADSPI1 FALSE +#define STM32_WSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) + #endif /* MCUCONF_H */ diff --git a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h index 996c435da..36d32eddb 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h index 2a8286cca..630316669 100644 --- a/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h +++ b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h index 2a8286cca..630316669 100644 --- a/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h +++ b/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h index 2a8286cca..630316669 100644 --- a/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h +++ b/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h index 2a8286cca..630316669 100644 --- a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h +++ b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h index d1256d49b..86d17e425 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h index d1256d49b..86d17e425 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h index d1256d49b..86d17e425 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h index d1256d49b..86d17e425 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h index d1256d49b..86d17e425 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h index 7d886fe8f..46c778850 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h @@ -222,12 +222,6 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7 #define STM32_PWM_TIM8_IRQ_PRIORITY 7 -/* - * QSPI driver system settings. - */ -#define STM32_QSPI_USE_QUADSPI1 FALSE -#define STM32_QSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) - /* * SDC driver system settings. */ @@ -324,4 +318,10 @@ */ #define STM32_WDG_USE_IWDG FALSE +/* + * WSPI driver system settings. + */ +#define STM32_WSPI_USE_QUADSPI1 FALSE +#define STM32_WSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) + #endif /* MCUCONF_H */ diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h index 6f608316a..545a6a835 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h @@ -124,13 +124,6 @@ #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. */ @@ -353,26 +346,6 @@ #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 - /*===========================================================================*/ /* SDC driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h index 175ae0617..adbc25508 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h @@ -222,12 +222,6 @@ #define STM32_PWM_TIM5_IRQ_PRIORITY 7 #define STM32_PWM_TIM8_IRQ_PRIORITY 7 -/* - * QSPI driver system settings. - */ -#define STM32_QSPI_USE_QUADSPI1 FALSE -#define STM32_QSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) - /* * SDC driver system settings. */ -- cgit v1.2.3