Added DAC-related keys to STM32 registry files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7977 35acf78f-673a-0410-8e92-d51de3d6d3f4

6 files changed, 198 insertions, 52 deletions

diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
index 68a76f699..ecd834bc5 100644
--- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
@@ -54,7 +54,12 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -201,7 +206,14 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -359,7 +371,10 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -498,7 +513,10 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -635,7 +653,10 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -769,7 +790,10 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC                       FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

diff --git a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
index 64ec729d5..85a693bf7 100644
--- a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
@@ -50,8 +50,14 @@
 #define STM32_CAN_MAX_FILTERS               0

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -191,8 +197,14 @@
 #define STM32_CAN_MAX_FILTERS               0

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -344,8 +356,10 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      FALSE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -470,8 +484,10 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      FALSE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -611,8 +627,14 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -788,8 +810,14 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -965,8 +993,14 @@
 #define STM32_CAN_MAX_FILTERS               28

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

diff --git a/os/hal/ports/STM32/STM32F37x/stm32_registry.h b/os/hal/ports/STM32/STM32F37x/stm32_registry.h
index 705e1e404..68db85acb 100644
--- a/os/hal/ports/STM32/STM32F37x/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F37x/stm32_registry.h
@@ -53,8 +53,16 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  TRUE

+#define STM32_DAC_DAC2_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 5)

+

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -233,8 +241,16 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  TRUE

+#define STM32_DAC_DAC2_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 5)

+

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
index a60d6a120..d3a130995 100644
--- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
@@ -60,8 +60,15 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

+

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -231,8 +238,16 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  TRUE

+#define STM32_DAC_DAC2_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 5)

+

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -383,8 +398,12 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -534,8 +553,12 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -688,8 +711,12 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -854,8 +881,12 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -1004,8 +1035,16 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  TRUE

+#define STM32_DAC_DAC2_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 5)

+

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -1153,8 +1192,14 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -1319,8 +1364,16 @@
 #define STM32_CAN_MAX_FILTERS               14

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      TRUE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

+

+#define STM32_HAS_DAC2_CH1                  TRUE

+#define STM32_DAC_DAC2_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 5)

+

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
index 6fc238e53..b875fe02a 100644
--- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
@@ -95,8 +95,10 @@
 #define STM32_CAN_MAX_FILTERS               28

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      FALSE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  TRUE

@@ -634,8 +636,10 @@
 #define STM32_CAN_MAX_FILTERS               28

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      FALSE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  TRUE

@@ -838,8 +842,10 @@
 #define STM32_HAS_CAN2                      FALSE

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      FALSE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  FALSE

+#define STM32_HAS_DAC1_CH2                  FALSE

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  TRUE

diff --git a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
index b52d308a0..4c5067db5 100644
--- a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
@@ -47,8 +47,14 @@
 #define STM32_CAN_MAX_FILTERS               0

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 2)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE

@@ -198,8 +204,15 @@
 #define STM32_CAN_MAX_FILTERS               0

 

 /* DAC attributes.*/

-#define STM32_HAS_DAC1                      TRUE

-#define STM32_HAS_DAC2                      FALSE

+#define STM32_HAS_DAC1_CH1                  TRUE

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 2)

+

+#define STM32_HAS_DAC1_CH2                  TRUE

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+

+#define STM32_HAS_DAC2_CH1                  FALSE

+#define STM32_HAS_DAC2_CH2                  FALSE

+

 

 /* DMA attributes.*/

 #define STM32_ADVANCED_DMA                  FALSE