From 9d6eb6ebf4f7fa9aeac7070fd2a8401bf350af38 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 9 Nov 2018 11:35:52 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12412 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h | 4 ++++ os/hal/ports/STM32/LLD/DMAv3/stm32_dma.h | 4 ++++ os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 9 +++++++++ os/hal/ports/STM32/STM32F7xx/stm32_registry.h | 3 +++ os/hal/ports/STM32/STM32H7xx/stm32_registry.h | 1 + os/hal/ports/STM32/STM32L1xx/stm32_registry.h | 2 +- os/hal/ports/STM32/STM32L4xx/stm32_registry.h | 4 ++++ 7 files changed, 26 insertions(+), 1 deletion(-) (limited to 'os/hal') diff --git a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h index aaae310c7..c4059a06c 100644 --- a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h +++ b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h @@ -216,6 +216,10 @@ /* Derived constants and error checks. */ /*===========================================================================*/ +#if !defined(STM32_DMA_SUPPORTS_DMAMUX) +#error "STM32_DMA_SUPPORTS_DMAMUX not defined in registry" +#endif + #if !defined(STM32_HAS_DMA1) #error "STM32_HAS_DMA1 missing in registry" #endif diff --git a/os/hal/ports/STM32/LLD/DMAv3/stm32_dma.h b/os/hal/ports/STM32/LLD/DMAv3/stm32_dma.h index b4bdf33ee..1d4106b17 100644 --- a/os/hal/ports/STM32/LLD/DMAv3/stm32_dma.h +++ b/os/hal/ports/STM32/LLD/DMAv3/stm32_dma.h @@ -178,6 +178,10 @@ /* Derived constants and error checks. */ /*===========================================================================*/ +#if !defined(STM32_DMA_SUPPORTS_DMAMUX) +#error "STM32_DMA_SUPPORTS_DMAMUX not defined in registry" +#endif + #if !defined(STM32_HAS_DMA1) #error "STM32_HAS_DMA1 missing in registry" #endif diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h index 4da2d8b88..0e1799bd3 100644 --- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h @@ -146,6 +146,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -528,6 +529,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -887,6 +889,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -1257,6 +1260,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -1641,6 +1645,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -1975,6 +1980,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -2289,6 +2295,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -2582,6 +2589,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -2930,6 +2938,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING FALSE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C diff --git a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h index 124a57f92..0452d67cd 100644 --- a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h @@ -94,6 +94,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING TRUE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -569,6 +570,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING TRUE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C @@ -1061,6 +1063,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_CACHE_HANDLING TRUE +#define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C diff --git a/os/hal/ports/STM32/STM32H7xx/stm32_registry.h b/os/hal/ports/STM32/STM32H7xx/stm32_registry.h index 067aa3fc1..c783b0942 100644 --- a/os/hal/ports/STM32/STM32H7xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32H7xx/stm32_registry.h @@ -89,6 +89,7 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA TRUE +#define STM32_DMA_SUPPORTS_DMAMUX TRUE #define STM32_HAS_DMA1 TRUE #define STM32_DMA1_CH0_HANDLER Vector6C diff --git a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h index b66714be1..bc5485ab3 100644 --- a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h @@ -84,9 +84,9 @@ /* DMA attributes.*/ #define STM32_ADVANCED_DMA FALSE - #define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_DMA_SUPPORTS_CSELR FALSE + #define STM32_DMA1_NUM_CHANNELS 7 #define STM32_DMA1_CH1_HANDLER Vector6C #define STM32_DMA1_CH2_HANDLER Vector70 diff --git a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h index 1bea6e22e..8ec9d3891 100644 --- a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h @@ -88,6 +88,7 @@ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_DMA_SUPPORTS_CSELR TRUE + #define STM32_DMA1_NUM_CHANNELS 7 #define STM32_DMA1_CH1_HANDLER Vector6C #define STM32_DMA1_CH2_HANDLER Vector70 @@ -428,6 +429,7 @@ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_DMA_SUPPORTS_CSELR TRUE + #define STM32_DMA1_NUM_CHANNELS 7 #define STM32_DMA1_CH1_HANDLER Vector6C #define STM32_DMA1_CH2_HANDLER Vector70 @@ -789,6 +791,7 @@ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_DMA_SUPPORTS_CSELR TRUE + #define STM32_DMA1_NUM_CHANNELS 7 #define STM32_DMA1_CH1_HANDLER Vector6C #define STM32_DMA1_CH2_HANDLER Vector70 @@ -1209,6 +1212,7 @@ #define STM32_ADVANCED_DMA TRUE #define STM32_DMA_SUPPORTS_DMAMUX FALSE #define STM32_DMA_SUPPORTS_CSELR TRUE + #define STM32_DMA1_NUM_CHANNELS 7 #define STM32_DMA1_CH1_HANDLER Vector6C #define STM32_DMA1_CH2_HANDLER Vector70 -- cgit v1.2.3